Fixes issue 29566: Upgrade Jasper Libraries
authorCarlos Aristu <carlos.aristu@openbravo.com>
Mon, 25 May 2015 12:31:46 +0200
changeset 26763 ac68a43ce656
parent 26737 0fd6131c786a (current diff)
parent 26762 6ade5c818884 (diff)
child 26764 fdb573cffe5f
Fixes issue 29566: Upgrade Jasper Libraries
lib/runtime/iText-2.1.7.jar
lib/runtime/jasperreports-4.0.1.jar
lib/runtime/jasperreports-fonts-4.0.1.jar
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/Apache_poi_license.txt	Mon May 25 12:31:46 2015 +0200
@@ -0,0 +1,507 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+APACHE POI SUBCOMPONENTS:
+
+Apache POI includes subcomponents with separate copyright notices and
+license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses:
+
+
+Office Open XML schemas (ooxml-schemas-1.0.jar)
+
+    The Office Open XML schema definitions used by Apache POI are
+    a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
+    As defined in section 9.4 of the ECMA bylaws [2], this specification
+    is available to all interested parties without restriction:
+
+        9.4 All documents when approved shall be made available to
+            all interested parties without restriction.
+
+    Furthermore, both Microsoft and Adobe have granted patent licenses
+    to this work [3,4,5].
+
+    [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
+    [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
+    [3] http://www.microsoft.com/interop/osp/
+    [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ECMA-376%20Edition%201%20Microsoft%20Patent%20Declaration.pdf
+    [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ga-2006-191.pdf
+
+
+DOM4J library (dom4j-1.6.1.jar)
+
+    Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+    Redistribution and use of this software and associated documentation
+    ("Software"), with or without modification, are permitted provided
+    that the following conditions are met:
+
+    1. Redistributions of source code must retain copyright
+       statements and notices.  Redistributions must also contain a
+       copy of this document.
+
+    2. Redistributions in binary form must reproduce the
+       above copyright notice, this list of conditions and the
+       following disclaimer in the documentation and/or other
+       materials provided with the distribution.
+
+    3. The name "DOM4J" must not be used to endorse or promote
+       products derived from this Software without prior written
+       permission of MetaStuff, Ltd.  For written permission,
+       please contact dom4j-info@metastuff.com.
+
+    4. Products derived from this Software may not be called "DOM4J"
+       nor may "DOM4J" appear in their names without prior written
+       permission of MetaStuff, Ltd. DOM4J is a registered
+       trademark of MetaStuff, Ltd.
+
+    5. Due credit should be given to the DOM4J Project - 
+       http://www.dom4j.org
+ 
+    THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+    NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+    METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+    OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+JUnit test library (junit-3.8.1.jar)
+
+    Common Public License - v 1.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+    1. DEFINITIONS
+
+    "Contribution" means:
+
+    a) in the case of the initial Contributor, the initial code and
+       documentation distributed under this Agreement, and
+
+    b) in the case of each subsequent Contributor:
+
+       i)  changes to the Program, and
+
+       ii) additions to the Program;
+
+       where such changes and/or additions to the Program originate from
+       and are distributed by that particular Contributor. A Contribution
+       'originates' from a Contributor if it was added to the Program by
+       such Contributor itself or anyone acting on such Contributor's behalf.
+       Contributions do not include additions to the Program which: (i) are
+       separate modules of software distributed in conjunction with the
+       Program under their own license agreement, and (ii) are not derivative
+       works of the Program.
+
+    "Contributor" means any person or entity that distributes the Program.
+
+    "Licensed Patents " mean patent claims licensable by a Contributor which
+    are necessarily infringed by the use or sale of its Contribution alone
+    or when combined with the Program.
+
+    "Program" means the Contributions distributed in accordance with this
+    Agreement.
+
+    "Recipient" means anyone who receives the Program under this Agreement,
+    including all Contributors.
+
+    2. GRANT OF RIGHTS
+
+    a) Subject to the terms of this Agreement, each Contributor hereby grants
+       Recipient a non-exclusive, worldwide, royalty-free copyright license
+       to reproduce, prepare derivative works of, publicly display, publicly
+       perform, distribute and sublicense the Contribution of such
+       Contributor, if any, and such derivative works, in source code and
+       object code form.
+
+    b) Subject to the terms of this Agreement, each Contributor hereby grants
+       Recipient a non-exclusive, worldwide, royalty-free patent license under
+       Licensed Patents to make, use, sell, offer to sell, import and
+       otherwise transfer the Contribution of such Contributor, if any, in
+       source code and object code form. This patent license shall apply to
+       the combination of the Contribution and the Program if, at the time
+       the Contribution is added by the Contributor, such addition of the
+       Contribution causes such combination to be covered by the Licensed
+       Patents. The patent license shall not apply to any other combinations
+       which include the Contribution. No hardware per se is licensed
+       hereunder.
+
+    c) Recipient understands that although each Contributor grants the
+       licenses to its Contributions set forth herein, no assurances are
+       provided by any Contributor that the Program does not infringe the
+       patent or other intellectual property rights of any other entity.
+       Each Contributor disclaims any liability to Recipient for claims
+       brought by any other entity based on infringement of intellectual
+       property rights or otherwise. As a condition to exercising the rights
+       and licenses granted hereunder, each Recipient hereby assumes sole
+       responsibility to secure any other intellectual property rights
+       needed, if any. For example, if a third party patent license is
+       required to allow Recipient to distribute the Program, it is
+       Recipient's responsibility to acquire that license before
+       distributing the Program.
+
+    d) Each Contributor represents that to its knowledge it has sufficient
+       copyright rights in its Contribution, if any, to grant the copyright
+       license set forth in this Agreement.
+
+    3. REQUIREMENTS
+
+    A Contributor may choose to distribute the Program in object code form
+    under its own license agreement, provided that:
+
+    a) it complies with the terms and conditions of this Agreement; and
+
+    b) its license agreement:
+
+       i)   effectively disclaims on behalf of all Contributors all warranties
+            and conditions, express and implied, including warranties or
+            conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular
+            purpose;
+
+       ii)  effectively excludes on behalf of all Contributors all liability
+            for damages, including direct, indirect, special, incidental and
+            consequential damages, such as lost profits;
+
+       iii) states that any provisions which differ from this Agreement are
+            offered by that Contributor alone and not by any other party; and
+
+       iv)  states that source code for the Program is available from such
+            Contributor, and informs licensees how to obtain it in a
+            reasonable manner on or through a medium customarily used for
+            software exchange.
+
+    When the Program is made available in source code form:
+
+    a) it must be made available under this Agreement; and
+
+    b) a copy of this Agreement must be included with each copy of
+       the Program.
+
+    Contributors may not remove or alter any copyright notices contained
+    within the Program.
+
+    Each Contributor must identify itself as the originator of its
+    Contribution, if any, in a manner that reasonably allows subsequent
+    Recipients to identify the originator of the Contribution.
+
+    4. COMMERCIAL DISTRIBUTION
+
+    Commercial distributors of software may accept certain responsibilities
+    with respect to end users, business partners and the like. While this
+    license is intended to facilitate the commercial use of the Program,
+    the Contributor who includes the Program in a commercial product offering
+    should do so in a manner which does not create potential liability for
+    other Contributors. Therefore, if a Contributor includes the Program
+    in a commercial product offering, such Contributor ("Commercial
+    Contributor") hereby agrees to defend and indemnify every other
+    Contributor ("Indemnified Contributor") against any losses, damages
+    and costs (collectively "Losses") arising from claims, lawsuits and
+    other legal actions brought by a third party against the Indemnified
+    Contributor to the extent caused by the acts or omissions of such
+    Commercial Contributor in connection with its distribution of the
+    Program in a commercial product offering. The obligations in this
+    section do not apply to any claims or Losses relating to any actual
+    or alleged intellectual property infringement. In order to qualify,
+    an Indemnified Contributor must: a) promptly notify the Commercial
+    Contributor in writing of such claim, and b) allow the Commercial
+    Contributor to control, and cooperate with the Commercial Contributor
+    in, the defense and any related settlement negotiations. The Indemnified
+    Contributor may participate in any such claim at its own expense.
+
+    For example, a Contributor might include the Program in a commercial
+    product offering, Product X. That Contributor is then a Commercial
+    Contributor. If that Commercial Contributor then makes performance
+    claims, or offers warranties related to Product X, those performance
+    claims and warranties are such Commercial Contributor's responsibility
+    alone. Under this section, the Commercial Contributor would have to
+    defend claims against the other Contributors related to those
+    performance claims and warranties, and if a court requires any other
+    Contributor to pay any damages as a result, the Commercial Contributor
+    must pay those damages.
+
+    5. NO WARRANTY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED
+    ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
+    EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
+    CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR
+    A PARTICULAR PURPOSE. Each Recipient is solely responsible for
+    determining the appropriateness of using and distributing the Program
+    and assumes all risks associated with its exercise of rights under this
+    Agreement, including but not limited to the risks and costs of program
+    errors, compliance with applicable laws, damage to or loss of data,
+    programs or equipment, and unavailability or interruption of operations.
+
+    6. DISCLAIMER OF LIABILITY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
+    ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+    WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+    DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+    HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    7. GENERAL
+
+    If any provision of this Agreement is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this Agreement, and without further
+    action by the parties hereto, such provision shall be reformed to the
+    minimum extent necessary to make such provision valid and enforceable.
+
+    If Recipient institutes patent litigation against a Contributor with
+    respect to a patent applicable to software (including a cross-claim or
+    counterclaim in a lawsuit), then any patent licenses granted by that
+    Contributor to such Recipient under this Agreement shall terminate as of
+    the date such litigation is filed. In addition, if Recipient institutes
+    patent litigation against any entity (including a cross-claim or
+    counterclaim in a lawsuit) alleging that the Program itself (excluding
+    combinations of the Program with other software or hardware) infringes
+    such Recipient's patent(s), then such Recipient's rights granted under
+    Section 2(b) shall terminate as of the date such litigation is filed.
+
+    All Recipient's rights under this Agreement shall terminate if it fails
+    to comply with any of the material terms or conditions of this Agreement
+    and does not cure such failure in a reasonable period of time after
+    becoming aware of such noncompliance. If all Recipient's rights under
+    this Agreement terminate, Recipient agrees to cease use and distribution
+    of the Program as soon as reasonably practicable. However, Recipient's
+    obligations under this Agreement and any licenses granted by Recipient
+    relating to the Program shall continue and survive.
+
+    Everyone is permitted to copy and distribute copies of this Agreement,
+    but in order to avoid inconsistency the Agreement is copyrighted and may
+    only be modified in the following manner. The Agreement Steward reserves
+    the right to publish new versions (including revisions) of this Agreement
+    from time to time. No one other than the Agreement Steward has the right
+    to modify this Agreement. IBM is the initial Agreement Steward. IBM may
+    assign the responsibility to serve as the Agreement Steward to a suitable
+    separate entity. Each new version of the Agreement will be given a
+    distinguishing version number. The Program (including Contributions) may
+    always be distributed subject to the version of the Agreement under which
+    it was received. In addition, after a new version of the Agreement is
+    published, Contributor may elect to distribute the Program (including
+    its Contributions) under the new version. Except as expressly stated in
+    Sections 2(a) and 2(b) above, Recipient receives no rights or licenses
+    to the intellectual property of any Contributor under this Agreement,
+    whether expressly, by implication, estoppel or otherwise. All rights in
+    the Program not expressly granted under this Agreement are reserved.
+
+    This Agreement is governed by the laws of the State of New York and the
+    intellectual property laws of the United States of America. No party to
+    this Agreement will bring a legal action under this Agreement more than
+    one year after the cause of action arose. Each party waives its rights
+    to a jury trial in any resulting litigation.
--- a/legal/Licensing.txt	Tue May 19 13:26:52 2015 +0200
+++ b/legal/Licensing.txt	Mon May 25 12:31:46 2015 +0200
@@ -136,16 +136,28 @@
 # Dynarch DHTML/Javascript calendar at web/js/jscalendar (Copyright Mihai
   Bazon, 2002, 2003 - http://dynarch.com/mishoo/)
 
-# itext-2.1.7.jar  
-# jasperreports-4.0.1.jar 
-# jasperreports-fonts-4.0.1.jar
+# itextpdf-5.5.0.jar
+# itext-pdfa-5.5.0.jar
+Both files under AGPL V3 license with LGPL Exception (included as iTextpdf_license.txt in this folder)
+
+# jackson-core-2.1.4.jar
+# jackson-databind-2.1.4.jar
+# jackson-annotations-2.1.4.jar
+All files under the Apache 2.0 license (included as Apache_license-2.0.txt in this folder)
+
+# jasperreports-6.0.0.jar
+Under the terms of the LGPL 3.0, available at http://www.gnu.org/licenses/lgpl-3.0.html
+
+# jasperreports-fonts-6.0.0.jar
+License is contained in the jar file itself (path: net/sf/jasperreports/fonts/dejavu/LICENSE)
+
 # jcommon-1.0.15.jar 
 # jfreechart-1.0.12.jar
 # jxl-2.6.10.jar
 All files under the LGPL 2.1 (available at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
 
-# jasperreports-fonts-4.0.1.jar
-License is contained in the jar file itself (path: net/sf/jasperreports/fonts/dejavu/LICENSE)
+# poi-3.10.1.jar
+Under the Apache 2.0 license (included as Apache_poi_license.txt in this folder)
 
 # hibernate3.jar
 All files under the LGPL 2.1 (available at www.gnu.org/licenses/lgpl.html)
@@ -170,9 +182,6 @@
 # javassist-3.14.0-GA.jar
 Under MPL License (included as MPL-1.1.txt in this folder)
 
-# iText-2.1.7.jar
-Under MPL/GPL License (included as MPL-1.1.txt in this folder)
-
 # slf4j-api-1.6.1.jar
 # slf4j-log4j12-1.6.1.jar
 Under MIT license. (available at http://www.slf4j.org/license.html)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/iTextpdf_license.txt	Mon May 25 12:31:46 2015 +0200
@@ -0,0 +1,452 @@
+
+iText Version 5 LGPL Exception
+
+As a special exception, the copyright holders of this library 
+give you permission to use this library only in connection with 
+the Jaspersoft LGPL Library and may only be distributed as part of the 
+Jaspersoft LGPL Library. You may only call the library through interfaces 
+provided in the Jaspersoft LGPL Library and not in any way use this library 
+except through the Jaspersoft LGPL Library. If you redistribute the 
+Jaspersoft LGPL Library with this library, you must extend this exception 
+to your version of the library. If you choose to remove this library from 
+the Jaspersoft LGPL Library, you may remove this restriction.
+
+---------------------------------------------------------------------------
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+.
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+.
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+.
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+.
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+.
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+.
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+.
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
Binary file lib/runtime/iText-2.1.7.jar has changed
Binary file lib/runtime/itext-pdfa-5.5.0.jar has changed
Binary file lib/runtime/itextpdf-5.5.0.jar has changed
Binary file lib/runtime/jackson-annotations-2.1.4.jar has changed
Binary file lib/runtime/jackson-core-2.1.4.jar has changed
Binary file lib/runtime/jackson-databind-2.1.4.jar has changed
Binary file lib/runtime/jasperreports-4.0.1.jar has changed
Binary file lib/runtime/jasperreports-6.0.0.jar has changed
Binary file lib/runtime/jasperreports-fonts-4.0.1.jar has changed
Binary file lib/runtime/jasperreports-fonts-6.0.0.jar has changed
Binary file lib/runtime/poi-3.10.1.jar has changed
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingDeposit.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingDeposit.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,31 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="OutstandingDeposit"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="495"
-		 pageHeight="802"
-		 columnWidth="495"
-		 columnSpacing="0"
-		 leftMargin="0"
-		 rightMargin="0"
-		 topMargin="0"
-		 bottomMargin="0"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<parameter name="RECONCILIATION_ID" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
-	<queryString><![CDATA[SELECT trans.statementdate as TRANS_DATE, coalesce(TO_CHAR(bp.name), TO_CHAR(gl.name), '') as DESCRIPTION,
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="OutstandingDeposit" pageWidth="495" pageHeight="802" columnWidth="495" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="1af2118e-1b84-4505-a21c-d6edce710df6">
+	<property name="ireport.scriptlethandling" value="0"/>
+	<property name="ireport.encoding" value="UTF-8"/>
+	<import value="net.sf.jasperreports.engine.*"/>
+	<import value="java.util.*"/>
+	<import value="net.sf.jasperreports.engine.data.*"/>
+	<parameter name="RECONCILIATION_ID" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
+	<queryString>
+		<![CDATA[SELECT trans.statementdate as TRANS_DATE, coalesce(TO_CHAR(bp.name), TO_CHAR(gl.name), '') as DESCRIPTION,
        coalesce(TO_CHAR(p.documentno), '') as REF, trans.depositamt as AMOUNT
 FROM fin_finacc_transaction trans
      left join fin_payment p on (trans.fin_payment_id = p.fin_payment_id)
@@ -45,128 +28,117 @@
       and trans.statementdate <= (SELECT rec.dateto
                                   FROM fin_reconciliation rec 
                                   WHERE fin_reconciliation_id=$P{RECONCILIATION_ID})
-ORDER BY TRANS_DATE, DESCRIPTION, AMOUNT]]></queryString>
-
+ORDER BY TRANS_DATE, DESCRIPTION, AMOUNT]]>
+	</queryString>
 	<field name="TRANS_DATE" class="java.util.Date"/>
 	<field name="DESCRIPTION" class="java.lang.String"/>
 	<field name="REF" class="java.lang.String"/>
 	<field name="AMOUNT" class="java.math.BigDecimal"/>
-
-	<variable name="SUM_LINEAMT" class="java.math.BigDecimal" resetType="Report" calculation="Sum">
+	<variable name="SUM_LINEAMT" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{AMOUNT}]]></variableExpression>
 	</variable>
-		<background>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</background>
-		<title>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</title>
-		<pageHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageHeader>
-		<columnHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnHeader>
-		<detail>
-			<band height="15"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="0"
-						y="0"
-						width="70"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[$F{TRANS_DATE}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="70"
-						y="0"
-						width="188"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{DESCRIPTION}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="258"
-						y="0"
-						width="122"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{REF}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{AMOUNT}!=null) ? $P{NUMBERFORMAT}.format($F{AMOUNT}).toString() : new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnFooter>
-		<pageFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageFooter>
-		<summary>
-			<band height="25"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						key="textField-2"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{SUM_LINEAMT}!=null) ? $P{NUMBERFORMAT}.format($V{SUM_LINEAMT}).toString() : new String(" ")]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement
-						x="211"
-						y="0"
-						width="169"
-						height="15"
-						key="staticText-1"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band splitType="Stretch"/>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band height="15" splitType="Stretch">
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="0" y="0" width="70" height="15" forecolor="#000000" uuid="5ac60df2-6c41-4681-bd2b-9474e879ab38"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{TRANS_DATE}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement key="textField" x="70" y="0" width="188" height="15" forecolor="#000000" uuid="ddbee985-5f0d-4be7-9284-f1eb9dbe9080"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DESCRIPTION}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement key="textField" x="258" y="0" width="122" height="15" forecolor="#000000" uuid="249df10b-bf4b-4a49-bc4d-4c5503e5cfa9"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{REF}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="380" y="0" width="115" height="15" forecolor="#000000" uuid="40755f84-a183-4d01-8c7c-eecb69087484"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[($F{AMOUNT}!=null) ? $P{NUMBERFORMAT}.format($F{AMOUNT}).toString() : new String(" ")]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="25" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField-2" x="380" y="0" width="115" height="15" uuid="e1b430bd-f552-4b70-bf5a-1f3323ec260a"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[($V{SUM_LINEAMT}!=null) ? $P{NUMBERFORMAT}.format($V{SUM_LINEAMT}).toString() : new String(" ")]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement key="staticText-1" x="211" y="0" width="169" height="15" uuid="fa3e7b86-f129-463f-92cb-10c0496e4085"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="false"/>
+				</textElement>
 				<text><![CDATA[Total Outstanding Deposits]]></text>
-				</staticText>
-			</band>
-		</summary>
+			</staticText>
+		</band>
+	</summary>
 </jasperReport>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingPayment.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingPayment.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,31 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="OutstandingPayment"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="495"
-		 pageHeight="802"
-		 columnWidth="495"
-		 columnSpacing="0"
-		 leftMargin="0"
-		 rightMargin="0"
-		 topMargin="0"
-		 bottomMargin="0"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<parameter name="RECONCILIATION_ID" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
-	<queryString><![CDATA[SELECT trans.statementdate as TRANS_DATE, coalesce(TO_CHAR(bp.name), TO_CHAR(gl.name), '') as DESCRIPTION,
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="OutstandingPayment" pageWidth="495" pageHeight="802" columnWidth="495" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="68f50d23-a828-4773-baa9-43d29eba6e70">
+	<property name="ireport.scriptlethandling" value="0"/>
+	<property name="ireport.encoding" value="UTF-8"/>
+	<import value="net.sf.jasperreports.engine.*"/>
+	<import value="java.util.*"/>
+	<import value="net.sf.jasperreports.engine.data.*"/>
+	<parameter name="RECONCILIATION_ID" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
+	<queryString>
+		<![CDATA[SELECT trans.statementdate as TRANS_DATE, coalesce(TO_CHAR(bp.name), TO_CHAR(gl.name), '') as DESCRIPTION,
        coalesce(TO_CHAR(p.documentno), '') as REF, trans.paymentamt as AMOUNT
 FROM fin_finacc_transaction trans
      left join fin_payment p on (trans.fin_payment_id = p.fin_payment_id)
@@ -45,128 +28,117 @@
       and trans.statementdate <= (SELECT rec.dateto
                                   FROM fin_reconciliation rec 
                                   WHERE fin_reconciliation_id=$P{RECONCILIATION_ID})
-ORDER BY TRANS_DATE, DESCRIPTION, AMOUNT]]></queryString>
-
+ORDER BY TRANS_DATE, DESCRIPTION, AMOUNT]]>
+	</queryString>
 	<field name="TRANS_DATE" class="java.util.Date"/>
 	<field name="DESCRIPTION" class="java.lang.String"/>
 	<field name="REF" class="java.lang.String"/>
 	<field name="AMOUNT" class="java.math.BigDecimal"/>
-
-	<variable name="SUM_LINEAMT" class="java.math.BigDecimal" resetType="Report" calculation="Sum">
+	<variable name="SUM_LINEAMT" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{AMOUNT}]]></variableExpression>
 	</variable>
-		<background>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</background>
-		<title>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</title>
-		<pageHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageHeader>
-		<columnHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnHeader>
-		<detail>
-			<band height="15"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="0"
-						y="0"
-						width="70"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[$F{TRANS_DATE}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="70"
-						y="0"
-						width="188"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{DESCRIPTION}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="258"
-						y="0"
-						width="122"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{REF}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{AMOUNT}!=null) ? $P{NUMBERFORMAT}.format($F{AMOUNT}).toString() : new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnFooter>
-		<pageFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageFooter>
-		<summary>
-			<band height="25"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						key="textField-2"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{SUM_LINEAMT}!=null) ? $P{NUMBERFORMAT}.format($V{SUM_LINEAMT}).toString() : new String(" ")]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement
-						x="211"
-						y="0"
-						width="169"
-						height="15"
-						key="staticText-1"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band splitType="Stretch"/>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band height="15" splitType="Stretch">
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="0" y="0" width="70" height="15" forecolor="#000000" uuid="a58d2606-6d3e-4595-a71b-47c49b5bb0f5"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{TRANS_DATE}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement key="textField" x="70" y="0" width="188" height="15" forecolor="#000000" uuid="39ac3c1c-b0f1-4bad-937e-4e62b45dbe7a"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DESCRIPTION}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement key="textField" x="258" y="0" width="122" height="15" forecolor="#000000" uuid="1fbd1971-7218-460e-ac70-34fa2b4eafa9"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{REF}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="380" y="0" width="115" height="15" forecolor="#000000" uuid="af740822-7e13-440c-8024-2e59eeb97147"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[($F{AMOUNT}!=null) ? $P{NUMBERFORMAT}.format($F{AMOUNT}).toString() : new String(" ")]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="25" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField-2" x="380" y="0" width="115" height="15" uuid="c6b5b448-e481-4f99-a0fe-2bab0061aa25"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[($V{SUM_LINEAMT}!=null) ? $P{NUMBERFORMAT}.format($V{SUM_LINEAMT}).toString() : new String(" ")]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement key="staticText-1" x="211" y="0" width="169" height="15" uuid="6ac100e3-91e4-4d9e-8a04-10fc24919482"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="false"/>
+				</textElement>
 				<text><![CDATA[Total Outstanding Payments]]></text>
-				</staticText>
-			</band>
-		</summary>
+			</staticText>
+		</band>
+	</summary>
 </jasperReport>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java	Mon May 25 12:31:46 2015 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -39,10 +39,10 @@
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.client.application.report.ReportingUtils;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
-import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.financialmgmt.payment.FIN_BankStatement;
 import org.openbravo.model.financialmgmt.payment.FIN_BankStatementLine;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
@@ -107,15 +107,15 @@
     JasperReport subReportOutstandingDeposit;
     JasperReport subReportUnreconciledBankStatementLines;
     try {
-      subReportOutstandingPayment = Utility.getTranslatedJasperReport(this, strBaseDesign
+      subReportOutstandingPayment = ReportingUtils.getTranslatedJasperReport(this, strBaseDesign
           + "/org/openbravo/advpaymentmngt/ad_reports/OutstandingPayment.jrxml",
           vars.getLanguage(), strBaseDesign);
 
-      subReportOutstandingDeposit = Utility.getTranslatedJasperReport(this, strBaseDesign
+      subReportOutstandingDeposit = ReportingUtils.getTranslatedJasperReport(this, strBaseDesign
           + "/org/openbravo/advpaymentmngt/ad_reports/OutstandingDeposit.jrxml",
           vars.getLanguage(), strBaseDesign);
 
-      subReportUnreconciledBankStatementLines = Utility.getTranslatedJasperReport(this,
+      subReportUnreconciledBankStatementLines = ReportingUtils.getTranslatedJasperReport(this,
           strBaseDesign
               + "/org/openbravo/advpaymentmngt/ad_reports/UnreconciledBankStatement.jrxml",
           vars.getLanguage(), strBaseDesign);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportReconciliation" pageWidth="595" pageHeight="842" columnWidth="495" leftMargin="50" rightMargin="50" topMargin="50" bottomMargin="50">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportReconciliation" pageWidth="595" pageHeight="842" columnWidth="495" leftMargin="50" rightMargin="50" topMargin="50" bottomMargin="50" uuid="e13c9c87-3b33-4f48-a07d-126ffc8c7729">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="1.652892561983471"/>
@@ -44,10 +44,10 @@
 		<groupHeader>
 			<band height="30" splitType="Stretch">
 				<rectangle>
-					<reportElement key="rectangle-1" style="Gray" x="0" y="7" width="495" height="15"/>
+					<reportElement key="rectangle-1" style="Gray" x="0" y="7" width="495" height="15" uuid="c131ded8-d8f2-4052-addb-c98d78860259"/>
 				</rectangle>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-3" x="1" y="8" width="70" height="14"/>
+					<reportElement key="textField-3" x="1" y="8" width="70" height="14" uuid="f698ef9c-e197-4c6e-b8c2-937f07ae24ee"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -55,10 +55,10 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{DATE}]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-6" x="380" y="8" width="115" height="14"/>
+					<reportElement key="textField-6" x="380" y="8" width="115" height="14" uuid="e20b0215-be5f-4bc9-8484-c1216fa7abff"/>
 					<box rightPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -66,10 +66,10 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
-					<textFieldExpression class="java.lang.String"><![CDATA[($P{ACC_BAL_OB}!=null) ? $P{NUMBERFORMAT}.format($P{ACC_BAL_OB}).toString() : new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{ACC_BAL_OB}!=null) ? $P{NUMBERFORMAT}.format($P{ACC_BAL_OB}).toString() : new String(" ")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-23" x="70" y="8" width="310" height="14"/>
+					<reportElement key="staticText-23" x="70" y="8" width="310" height="14" uuid="dedb8b72-67d5-42c2-a44c-3d47b6b1172a"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -84,10 +84,10 @@
 		<groupFooter>
 			<band height="40" splitType="Stretch">
 				<rectangle>
-					<reportElement key="rectangle-2" style="Gray" x="0" y="3" width="495" height="15"/>
+					<reportElement key="rectangle-2" style="Gray" x="0" y="3" width="495" height="15" uuid="77a6adec-f717-4469-8907-19ca51c860c1"/>
 				</rectangle>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-7" x="1" y="4" width="70" height="14"/>
+					<reportElement key="textField-7" x="1" y="4" width="70" height="14" uuid="ebd65b0c-a05a-46df-9310-62f0c0167fd8"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -95,10 +95,10 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{DATE}]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-8" x="380" y="4" width="115" height="14"/>
+					<reportElement key="textField-8" x="380" y="4" width="115" height="14" uuid="11a2be14-6b04-4850-9721-79f5d8c65ab9"/>
 					<box rightPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -106,10 +106,10 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
-					<textFieldExpression class="java.lang.String"><![CDATA[($P{ADJ_ACC_BAL_OB}!=null) ? "(" + $P{NUMBERFORMAT}.format($P{ADJ_ACC_BAL_OB}).toString() + ")" : new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{ADJ_ACC_BAL_OB}!=null) ? "(" + $P{NUMBERFORMAT}.format($P{ADJ_ACC_BAL_OB}).toString() + ")" : new String(" ")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-24" x="70" y="4" width="310" height="14"/>
+					<reportElement key="staticText-24" x="70" y="4" width="310" height="14" uuid="ec4b912e-f847-461b-8cdf-52b0851fa4cc"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -120,10 +120,10 @@
 					<text><![CDATA[Adjusted Account Balance in Openbravo]]></text>
 				</staticText>
 				<rectangle>
-					<reportElement key="rectangle-3" style="Gray" x="0" y="18" width="495" height="15"/>
+					<reportElement key="rectangle-3" style="Gray" x="0" y="18" width="495" height="15" uuid="83c149f4-c94e-4277-a9e1-cd66915411b9"/>
 				</rectangle>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-9" x="1" y="19" width="70" height="14"/>
+					<reportElement key="textField-9" x="1" y="19" width="70" height="14" uuid="2ff6df70-fba7-437f-ab4d-79ed1d76b535"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -131,10 +131,10 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement verticalAlignment="Middle"/>
-					<textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{DATE}]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-10" x="380" y="19" width="115" height="14"/>
+					<reportElement key="textField-10" x="380" y="19" width="115" height="14" uuid="1e1fd754-07de-49f9-a954-ee948b9ae3a0"/>
 					<box rightPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -142,10 +142,10 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
-					<textFieldExpression class="java.lang.String"><![CDATA[($P{END_BALANCE}!=null) ? "(" + $P{NUMBERFORMAT}.format($P{END_BALANCE}).toString() + ")" : new String("")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{END_BALANCE}!=null) ? "(" + $P{NUMBERFORMAT}.format($P{END_BALANCE}).toString() + ")" : new String("")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-25" x="70" y="19" width="310" height="14"/>
+					<reportElement key="staticText-25" x="70" y="19" width="310" height="14" uuid="c947f4cd-8ddc-4877-88d0-5df9f13690ab"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -164,7 +164,7 @@
 			<band height="20" splitType="Stretch">
 				<printWhenExpression><![CDATA[$P{SHOW_BAND_PAYMENT}]]></printWhenExpression>
 				<subreport isUsingCache="true">
-					<reportElement key="subreport-1" mode="Transparent" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true">
+					<reportElement key="subreport-1" mode="Transparent" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true" uuid="a36cebad-9476-4752-ad81-31a21d0b935b">
 						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
 					</reportElement>
 					<subreportParameter name="RECONCILIATION_ID">
@@ -174,10 +174,10 @@
 						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
 					</subreportParameter>
 					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<subreportExpression class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_OUTPAYMENT}]]></subreportExpression>
+					<subreportExpression><![CDATA[$P{SUBREP_OUTPAYMENT}]]></subreportExpression>
 				</subreport>
 				<staticText>
-					<reportElement key="staticText-11" x="0" y="0" width="244" height="14" isRemoveLineWhenBlank="true"/>
+					<reportElement key="staticText-11" x="0" y="0" width="244" height="14" isRemoveLineWhenBlank="true" uuid="0b5e5060-e767-45ee-9a73-62e1fe888c76"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -190,13 +190,13 @@
 					<text><![CDATA[Plus Outstanding Payments]]></text>
 				</staticText>
 				<line>
-					<reportElement key="line-1" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF"/>
+					<reportElement key="line-1" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF" uuid="9a6fc40b-e9c8-4122-8aff-909ea440abd9"/>
 					<graphicElement>
 						<pen lineWidth="0.5" lineStyle="Solid"/>
 					</graphicElement>
 				</line>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-12" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true">
+					<reportElement key="textField-12" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true" uuid="0e7a51ba-c00a-4baf-a6fa-e506064ab764">
 						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
 					</reportElement>
 					<box rightPadding="5">
@@ -206,7 +206,7 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
-					<textFieldExpression class="java.lang.String"><![CDATA[($P{AMT_OUT_PAYMENT}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_OUT_PAYMENT}).toString() : new String("")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{AMT_OUT_PAYMENT}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_OUT_PAYMENT}).toString() : new String("")]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
@@ -220,7 +220,7 @@
 			<band height="20" splitType="Stretch">
 				<printWhenExpression><![CDATA[$P{SHOW_BAND_DEPOSIT}]]></printWhenExpression>
 				<subreport isUsingCache="true">
-					<reportElement key="subreport-2" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true">
+					<reportElement key="subreport-2" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true" uuid="9dba37c9-3624-40e9-853b-a4a36f35f563">
 						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
 					</reportElement>
 					<subreportParameter name="RECONCILIATION_ID">
@@ -230,10 +230,10 @@
 						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
 					</subreportParameter>
 					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<subreportExpression class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_OUTDEPOSIT}]]></subreportExpression>
+					<subreportExpression><![CDATA[$P{SUBREP_OUTDEPOSIT}]]></subreportExpression>
 				</subreport>
 				<staticText>
-					<reportElement key="staticText-12" x="0" y="0" width="244" height="14" isRemoveLineWhenBlank="true"/>
+					<reportElement key="staticText-12" x="0" y="0" width="244" height="14" isRemoveLineWhenBlank="true" uuid="d3314afd-5f53-409e-bce5-13b6a2f86b68"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -246,13 +246,13 @@
 					<text><![CDATA[Less Outstanding Deposits]]></text>
 				</staticText>
 				<line>
-					<reportElement key="line-2" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF"/>
+					<reportElement key="line-2" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF" uuid="664c30d7-8479-4cbd-9697-ac3baa7fe10f"/>
 					<graphicElement>
 						<pen lineWidth="0.5" lineStyle="Solid"/>
 					</graphicElement>
 				</line>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-13" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true">
+					<reportElement key="textField-13" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true" uuid="e63299d1-73b3-493e-a4c7-bb6b9fac4db4">
 						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
 					</reportElement>
 					<box rightPadding="5">
@@ -262,7 +262,7 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
-					<textFieldExpression class="java.lang.String"><![CDATA[($P{AMT_OUT_DEPOSIT}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_OUT_DEPOSIT}).toString() : new String("")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{AMT_OUT_DEPOSIT}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_OUT_DEPOSIT}).toString() : new String("")]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
@@ -276,7 +276,7 @@
 			<band height="20" splitType="Stretch">
 				<printWhenExpression><![CDATA[$P{SHOW_BAND_BSLINE}]]></printWhenExpression>
 				<staticText>
-					<reportElement key="staticText-16" x="0" y="0" width="244" height="14" isRemoveLineWhenBlank="true"/>
+					<reportElement key="staticText-16" x="0" y="0" width="244" height="14" isRemoveLineWhenBlank="true" uuid="0833c76d-7ec5-41e1-bba1-b8ce28dd3375"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -289,7 +289,7 @@
 					<text><![CDATA[Plus Un-reconciled Bank Statement Lines]]></text>
 				</staticText>
 				<subreport isUsingCache="true">
-					<reportElement key="subreport-3" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true">
+					<reportElement key="subreport-3" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true" uuid="7b4b599a-f070-49ea-8f56-53d99829d71f">
 						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
 					</reportElement>
 					<subreportParameter name="RECONCILIATION_ID">
@@ -299,22 +299,22 @@
 						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
 					</subreportParameter>
 					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<subreportExpression class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_UNRECBS}]]></subreportExpression>
+					<subreportExpression><![CDATA[$P{SUBREP_UNRECBS}]]></subreportExpression>
 				</subreport>
 				<line>
-					<reportElement key="line-3" x="0" y="13" width="495" height="1" forecolor="#E4DFDF"/>
+					<reportElement key="line-3" x="0" y="13" width="495" height="1" forecolor="#E4DFDF" uuid="d3d4172d-df6f-4db8-9c53-17ea62397922"/>
 					<graphicElement>
 						<pen lineWidth="0.5" lineStyle="Solid"/>
 					</graphicElement>
 				</line>
 				<line>
-					<reportElement key="line-4" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF"/>
+					<reportElement key="line-4" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF" uuid="3a93a5da-d574-44d2-b131-e6ab82ebc9fb"/>
 					<graphicElement>
 						<pen lineWidth="0.5" lineStyle="Solid"/>
 					</graphicElement>
 				</line>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-14" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true">
+					<reportElement key="textField-14" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true" uuid="8b13e43c-7a3c-44b7-866a-03eac41ecfa5">
 						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
 					</reportElement>
 					<box rightPadding="5">
@@ -324,7 +324,7 @@
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
-					<textFieldExpression class="java.lang.String"><![CDATA[($P{AMT_UNREC_BSLINE}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_UNREC_BSLINE}).toString() : new String("")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{AMT_UNREC_BSLINE}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_UNREC_BSLINE}).toString() : new String("")]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
@@ -338,7 +338,7 @@
 	<title>
 		<band height="25" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-26" x="0" y="0" width="495" height="25">
+				<reportElement key="staticText-26" x="0" y="0" width="495" height="25" uuid="6c3c0ed7-5ada-4eb2-9a35-f3c82eef720b">
 					<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
 				</reportElement>
 				<box>
@@ -353,7 +353,7 @@
 				<text><![CDATA[Reconciliation Report]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-27" x="0" y="0" width="495" height="25">
+				<reportElement key="staticText-27" x="0" y="0" width="495" height="25" uuid="22fac109-dca3-4630-811f-d1f8199fd514">
 					<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
 				</reportElement>
 				<box>
@@ -372,7 +372,7 @@
 	<pageHeader>
 		<band height="36" splitType="Stretch">
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" x="50" y="0" width="445" height="18"/>
+				<reportElement key="textField" x="50" y="0" width="445" height="18" uuid="4adac3c2-d1f5-437c-8612-894c8e9ee6e5"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -382,10 +382,10 @@
 				<textElement>
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DATEFORMAT}.format($P{DATE})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DATEFORMAT}.format($P{DATE})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-11" x="50" y="18" width="445" height="18"/>
+				<reportElement key="textField-11" x="50" y="18" width="445" height="18" uuid="d7dd3a80-36b8-4eaa-b572-b40dc48b7e43"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -395,17 +395,17 @@
 				<textElement>
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{FINACCOUNT_INFO}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{FINACCOUNT_INFO}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="0" width="50" height="18"/>
+				<reportElement x="0" y="0" width="50" height="18" uuid="0c8c978a-ad85-444d-9fec-dd7909a55e5f"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
 				<text><![CDATA[per]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="18" width="50" height="18"/>
+				<reportElement x="0" y="18" width="50" height="18" uuid="137ddc7b-527b-4f23-8ee9-a6189e5185a2"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
@@ -416,7 +416,7 @@
 	<columnHeader>
 		<band height="18" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-19" style="DarkGray" x="0" y="0" width="70" height="18"/>
+				<reportElement key="staticText-19" style="DarkGray" x="0" y="0" width="70" height="18" uuid="54c6e368-4ea7-4ce3-a1b2-757cb9c9ed90"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -429,7 +429,7 @@
 				<text><![CDATA[Date]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-20" style="DarkGray" x="70" y="0" width="188" height="18"/>
+				<reportElement key="staticText-20" style="DarkGray" x="70" y="0" width="188" height="18" uuid="d2840ae6-4063-456d-b382-400e80153de8"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -442,7 +442,7 @@
 				<text><![CDATA[Business Partner]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-21" style="DarkGray" x="258" y="0" width="122" height="18"/>
+				<reportElement key="staticText-21" style="DarkGray" x="258" y="0" width="122" height="18" uuid="f05dabc0-7803-4c62-aad5-f14806af8731"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -455,7 +455,7 @@
 				<text><![CDATA[Reference]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-22" style="DarkGray" x="380" y="0" width="115" height="18"/>
+				<reportElement key="staticText-22" style="DarkGray" x="380" y="0" width="115" height="18" uuid="807da193-bf78-4771-8151-e3b4dfa2bb90"/>
 				<box leftPadding="5" rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -478,7 +478,7 @@
 	<pageFooter>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-18" x="177" y="5" width="64" height="10"/>
+				<reportElement key="staticText-18" x="177" y="5" width="64" height="10" uuid="20547722-54b6-48b2-942c-b48f3ba3b0fa"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -491,7 +491,7 @@
 				<text><![CDATA[Printed on ]]></text>
 			</staticText>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-1" x="245" y="5" width="69" height="10"/>
+				<reportElement key="textField-1" x="245" y="5" width="69" height="10" uuid="1de32c9b-3444-4247-921a-4c1cb89b3dd1"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -501,10 +501,10 @@
 				<textElement verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[new Date()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-2" x="325" y="5" width="141" height="10"/>
+				<reportElement key="textField-2" x="325" y="5" width="141" height="10" uuid="283754eb-9c0f-4ac1-9c93-86d8ca148e1a"/>
 				<box rightPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -514,10 +514,10 @@
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[" Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+				<textFieldExpression><![CDATA[" Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" isBlankWhenNull="false">
-				<reportElement key="textField-15" x="467" y="5" width="28" height="10"/>
+				<reportElement key="textField-15" x="467" y="5" width="28" height="10" uuid="df6a7d65-428f-46a2-9fd4-09384a521eb0"/>
 				<box leftPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -527,7 +527,7 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageFooter>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/UnreconciledBankStatement.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/UnreconciledBankStatement.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,31 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="UnreconciledBankStatement"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="495"
-		 pageHeight="802"
-		 columnWidth="495"
-		 columnSpacing="0"
-		 leftMargin="0"
-		 rightMargin="0"
-		 topMargin="0"
-		 bottomMargin="0"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<parameter name="RECONCILIATION_ID" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
-	<queryString><![CDATA[SELECT bsl.datetrx as BSLINE_DATE, coalesce(TO_CHAR(bp.name), TO_CHAR(bsl.bpartnername), '') as DESCRIPTION,
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="UnreconciledBankStatement" pageWidth="495" pageHeight="802" columnWidth="495" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="9495e9b0-c162-42e2-8a73-7748c5fd766f">
+	<property name="ireport.scriptlethandling" value="0"/>
+	<property name="ireport.encoding" value="UTF-8"/>
+	<import value="net.sf.jasperreports.engine.*"/>
+	<import value="java.util.*"/>
+	<import value="net.sf.jasperreports.engine.data.*"/>
+	<parameter name="RECONCILIATION_ID" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
+	<queryString>
+		<![CDATA[SELECT bsl.datetrx as BSLINE_DATE, coalesce(TO_CHAR(bp.name), TO_CHAR(bsl.bpartnername), '') as DESCRIPTION,
        bsl.referenceno as REF, (bsl.cramount - bsl.dramount) as AMOUNT
 FROM fin_bankstatementline bsl join fin_bankstatement bs on (bsl.fin_bankstatement_id=bs.fin_bankstatement_id)
      left join c_bpartner bp on (bp.c_bpartner_id = bsl.c_bpartner_id)
@@ -43,128 +26,117 @@
 						and fin_reconciliation.created > (SELECT rec.created
 							     FROM fin_reconciliation rec
 							     WHERE fin_reconciliation_id=$P{RECONCILIATION_ID})))
-ORDER BY BSLINE_DATE, DESCRIPTION, AMOUNT]]></queryString>
-
+ORDER BY BSLINE_DATE, DESCRIPTION, AMOUNT]]>
+	</queryString>
 	<field name="BSLINE_DATE" class="java.util.Date"/>
 	<field name="DESCRIPTION" class="java.lang.String"/>
 	<field name="REF" class="java.lang.String"/>
 	<field name="AMOUNT" class="java.math.BigDecimal"/>
-
-	<variable name="SUM_LINEAMT" class="java.math.BigDecimal" resetType="Report" calculation="Sum">
+	<variable name="SUM_LINEAMT" class="java.math.BigDecimal" calculation="Sum">
 		<variableExpression><![CDATA[$F{AMOUNT}]]></variableExpression>
 	</variable>
-		<background>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</background>
-		<title>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</title>
-		<pageHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageHeader>
-		<columnHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnHeader>
-		<detail>
-			<band height="15"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="0"
-						y="0"
-						width="70"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[$F{BSLINE_DATE}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="70"
-						y="0"
-						width="188"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{DESCRIPTION}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="258"
-						y="0"
-						width="122"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{REF}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						forecolor="#000000"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8" isBold="false" isItalic="false" isUnderline="false" isPdfEmbedded ="false" isStrikeThrough="false" />
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{AMOUNT}!=null) ? $P{NUMBERFORMAT}.format($F{AMOUNT}).toString() : new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnFooter>
-		<pageFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageFooter>
-		<summary>
-			<band height="25"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						key="textField-2"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{SUM_LINEAMT}!=null) ? $P{NUMBERFORMAT}.format($V{SUM_LINEAMT}).toString() : new String(" ")]]></textFieldExpression>
-				</textField>
-				<staticText>
-					<reportElement
-						x="211"
-						y="0"
-						width="169"
-						height="15"
-						key="staticText-1"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8" isBold="false"/>
-					</textElement>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band splitType="Stretch"/>
+	</title>
+	<pageHeader>
+		<band splitType="Stretch"/>
+	</pageHeader>
+	<columnHeader>
+		<band splitType="Stretch"/>
+	</columnHeader>
+	<detail>
+		<band height="15" splitType="Stretch">
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="0" y="0" width="70" height="15" forecolor="#000000" uuid="b88289cf-2a24-4069-8424-8ff153478d1e"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{BSLINE_DATE}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement key="textField" x="70" y="0" width="188" height="15" forecolor="#000000" uuid="a90cf7ad-08a1-44bc-9b14-02e75d629162"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{DESCRIPTION}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="true">
+				<reportElement key="textField" x="258" y="0" width="122" height="15" forecolor="#000000" uuid="538dcd06-f536-4782-b58b-9ed782de676d"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{REF}]]></textFieldExpression>
+			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement key="textField" x="380" y="0" width="115" height="15" forecolor="#000000" uuid="00a8a427-98a4-4f4d-a4fa-cf83845c204a"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" isPdfEmbedded="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[($F{AMOUNT}!=null) ? $P{NUMBERFORMAT}.format($F{AMOUNT}).toString() : new String(" ")]]></textFieldExpression>
+			</textField>
+		</band>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band splitType="Stretch"/>
+	</pageFooter>
+	<summary>
+		<band height="25" splitType="Stretch">
+			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
+				<reportElement key="textField-2" x="380" y="0" width="115" height="15" uuid="46be7abd-7bf1-425d-b759-f9c8eb850e43"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression><![CDATA[($V{SUM_LINEAMT}!=null) ? $P{NUMBERFORMAT}.format($V{SUM_LINEAMT}).toString() : new String(" ")]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement key="staticText-1" x="211" y="0" width="169" height="15" uuid="d3692343-d2f3-478e-9991-7668a97e3157"/>
+				<box rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8" isBold="false"/>
+				</textElement>
 				<text><![CDATA[Total Un-reconciled Bank Statement Lines]]></text>
-				</staticText>
-			</band>
-		</summary>
+			</staticText>
+		</band>
+	</summary>
 </jasperReport>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Mon May 25 12:31:46 2015 +0200
@@ -1533,6 +1533,18 @@
 <!--CA656863135B44B6BF645936B34C61C7-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--CA656863135B44B6BF645936B34C61C7--></AD_MESSAGE>
 
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA--><AD_MESSAGE>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <AD_MESSAGE_ID><![CDATA[CB123A82E3EF4C8CAB80A01884C2C4EA]]></AD_MESSAGE_ID>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <VALUE><![CDATA[OBUIAPP_UnsupportedAction]]></VALUE>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <MSGTEXT><![CDATA[Unsupported export action: %0]]></MSGTEXT>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--CB123A82E3EF4C8CAB80A01884C2C4EA--></AD_MESSAGE>
+
 <!--CB2FE513B6C0424A8D074AF6BDFC8607--><AD_MESSAGE>
 <!--CB2FE513B6C0424A8D074AF6BDFC8607-->  <AD_MESSAGE_ID><![CDATA[CB2FE513B6C0424A8D074AF6BDFC8607]]></AD_MESSAGE_ID>
 <!--CB2FE513B6C0424A8D074AF6BDFC8607-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Mon May 25 12:31:46 2015 +0200
@@ -71,7 +71,7 @@
 /**
  * Action Handler used as base for jasper reports generated from process defition. This handler can
  * be extended to customize its behavior.
- *
+ * 
  */
 public class BaseReportActionHandler extends BaseProcessActionHandler {
   private static final Logger log = LoggerFactory.getLogger(BaseReportActionHandler.class);
@@ -240,7 +240,8 @@
       strJRPath = report.getPDFTemplate();
       break;
     default:
-      throw new OBException(OBMessageUtils.messageBD("OBUIAPP_UnsupportedAction"));
+      throw new OBException(OBMessageUtils.getI18NMessage("OBUIAPP_UnsupportedAction",
+          new String[] { expType.getExtension() }));
     }
     if (StringUtils.isEmpty(strJRPath)) {
       throw new OBException(OBMessageUtils.messageBD("OBUIAPP_NoJRTemplateFound"));
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Mon May 25 12:31:46 2015 +0200
@@ -19,23 +19,50 @@
 package org.openbravo.client.application.report;
 
 import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
+import javax.servlet.http.HttpSession;
+
+import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRExporterParameter;
 import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JasperCompileManager;
 import net.sf.jasperreports.engine.JasperExportManager;
 import net.sf.jasperreports.engine.JasperFillManager;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.export.JExcelApiExporter;
-import net.sf.jasperreports.engine.export.JExcelApiExporterParameter;
+import net.sf.jasperreports.engine.design.JRDesignParameter;
+import net.sf.jasperreports.engine.design.JasperDesign;
+import net.sf.jasperreports.engine.export.HtmlExporter;
+import net.sf.jasperreports.engine.export.JRCsvExporter;
+import net.sf.jasperreports.engine.export.JRPdfExporter;
+import net.sf.jasperreports.engine.export.JRXlsExporter;
 import net.sf.jasperreports.engine.fill.JRSwapFileVirtualizer;
 import net.sf.jasperreports.engine.util.JRSwapFile;
+import net.sf.jasperreports.engine.xml.JRXmlLoader;
+import net.sf.jasperreports.export.SimpleCsvReportConfiguration;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
+import net.sf.jasperreports.export.SimpleHtmlReportConfiguration;
+import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
+import net.sf.jasperreports.export.SimplePdfExporterConfiguration;
+import net.sf.jasperreports.export.SimpleWriterExporterOutput;
+import net.sf.jasperreports.export.SimpleXlsReportConfiguration;
+import net.sf.jasperreports.export.type.HtmlSizeUnitEnum;
+import net.sf.jasperreports.j2ee.servlets.ImageServlet;
+import net.sf.jasperreports.web.util.WebHtmlResourceHandler;
 
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.session.OBPropertiesProvider;
@@ -44,22 +71,95 @@
 import org.openbravo.dal.core.DalContextListener;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.database.ConnectionProvider;
 import org.openbravo.erpCommon.utility.JRFormatFactory;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
-import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.utility.FileType;
 import org.openbravo.service.db.DalConnectionProvider;
+import org.openbravo.uiTranslation.TranslationHandler;
+import org.openbravo.utils.Replace;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** Utilities to generate jasper reports */
 public class ReportingUtils {
+  /**
+   * Used to set a report parameter with a org.openbravo.dal.core.OBContext which contains the
+   * OBContext that has launched the report.
+   */
   public static final String JASPER_PARAM_OBCONTEXT = "jasper_obContext";
+  /**
+   * Used to set a report parameter with an org.hibernate.Session object with the current hibernate.
+   * session.
+   */
   public static final String JASPER_PARAM_HBSESSION = "jasper_hbSession";
+  /**
+   * Used to set the parameter with the URI to retrieve images in HTML reports.
+   */
+  public static final String IMAGES_URI = "Images URI";
   private static final Logger log = LoggerFactory.getLogger(ReportingUtils.class);
 
   /**
-   * Exports the report to a file in a temporary folder.
+   * @see ReportingUtils#exportJR(String, ExportType, Map, File, boolean, ConnectionProvider,
+   *      JRDataSource, Map)
+   */
+  public static void exportJR(String jasperFilePath, ExportType expType,
+      Map<String, Object> parameters, String strFileName) throws OBException {
+    File target = new File(getTempFolder(), strFileName);
+    exportJR(jasperFilePath, expType, parameters, target, true, null, null, null);
+  }
+
+  /**
+   * @see ReportingUtils#exportJR(String, ExportType, Map, File, boolean, ConnectionProvider,
+   *      JRDataSource, Map)
+   */
+  public static void exportJR(String jasperFilePath, ExportType expType,
+      Map<String, Object> parameters, String strFileName, boolean addProcessDefinitionParameters)
+      throws OBException {
+    File target = new File(getTempFolder(), strFileName);
+    exportJR(jasperFilePath, expType, parameters, target, addProcessDefinitionParameters, null,
+        null, null);
+  }
+
+  /**
+   * @see ReportingUtils#exportJR(String, ExportType, Map, File, boolean, ConnectionProvider,
+   *      JRDataSource, Map)
+   */
+  public static void exportJR(String jasperFilePath, ExportType expType,
+      Map<String, Object> parameters, String strFileName, boolean addProcessDefinitionParameters,
+      ConnectionProvider connectionProvider, JRDataSource data,
+      Map<Object, Object> additionalExportParameters) throws OBException {
+    File target = new File(getTempFolder(), strFileName);
+    exportJR(jasperFilePath, expType, parameters, target, addProcessDefinitionParameters,
+        connectionProvider, data, additionalExportParameters);
+  }
+
+  /**
+   * @see ReportingUtils#exportJR(String, ExportType, Map, File, boolean, ConnectionProvider,
+   *      JRDataSource, Map, boolean)
+   */
+  public static void exportJR(String jasperFilePath, ExportType expType,
+      Map<String, Object> parameters, File target, boolean addProcessDefinitionParameters,
+      ConnectionProvider connectionProvider, JRDataSource data,
+      Map<Object, Object> additionalExportParameters) throws OBException {
+    exportJR(jasperFilePath, expType, parameters, target, addProcessDefinitionParameters,
+        connectionProvider, data, additionalExportParameters, false);
+  }
+
+  /**
+   * @see ReportingUtils#exportJR(String, ExportType, Map, OutputStream, boolean,
+   *      ConnectionProvider, JRDataSource, Map, boolean)
+   */
+  public static void exportJR(String jasperFilePath, ExportType expType,
+      Map<String, Object> parameters, OutputStream outputStream,
+      boolean addProcessDefinitionParameters, ConnectionProvider connectionProvider,
+      JRDataSource data, Map<Object, Object> additionalExportParameters) throws OBException {
+    exportJR(jasperFilePath, expType, parameters, outputStream, addProcessDefinitionParameters,
+        connectionProvider, data, additionalExportParameters, false);
+  }
+
+  /**
+   * Exports the report to a file.
    * 
    * @param jasperFilePath
    *          The path to the JR template of the report.
@@ -67,77 +167,625 @@
    *          The desired output type of the report.
    * @param parameters
    *          The parameters to be sent to Jasper Report.
-   * @param strFileName
-   *          The name to be used on the generated file.
+   * @param target
+   *          The file used to return the report.
+   * @param addProcessDefinitionParameters
+   *          A flag to indicate if the parameters needed to print a report from a Process
+   *          Definition should be added.
+   * @param connectionProvider
+   *          A connection provider in case the report needs it.
+   * @param data
+   *          The data to be used in the report, if required.
+   * @param additionalExportParameters
+   *          Additional export parameters than can be added to configure the resulting report.
+   * @param compileSubreports
+   *          A flag to indicate if the sub-reports should be compiled too. If true, the sub-report
+   *          jrxml files should be placed in the same folder as the main report and their name
+   *          should start with SUBREP_
    * @throws OBException
-   *           In case there is any error generating the file an exception is thrown with the error
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  public static void exportJR(String jasperFilePath, ExportType expType,
+      Map<String, Object> parameters, File target, boolean addProcessDefinitionParameters,
+      ConnectionProvider connectionProvider, JRDataSource data,
+      Map<Object, Object> additionalExportParameters, boolean compileSubreports) throws OBException {
+
+    JRSwapFileVirtualizer virtualizer = null;
+    Map<Object, Object> exportParameters = new HashMap<Object, Object>();
+    parameters.putAll(expType.getExportParameters());
+    if (additionalExportParameters != null && additionalExportParameters.size() > 0) {
+      exportParameters.putAll(additionalExportParameters);
+    }
+    // if no custom virtualizer is requested use a default one
+    if (!parameters.containsKey(JRParameter.REPORT_VIRTUALIZER)) {
+      // virtualizer is essentially using a tmp-file to avoid huge memory consumption by jasper
+      // when processing big reports
+      JRSwapFile swap = new JRSwapFile(getTempFolder(), 4096, 1);
+      // start using the virtualizer when having more than 100 pages of data
+      virtualizer = new JRSwapFileVirtualizer(100, swap);
+      parameters.put(JRParameter.REPORT_VIRTUALIZER, virtualizer);
+    }
+    if (addProcessDefinitionParameters) {
+      addProcessDefinitionParameters(parameters);
+    }
+    JasperPrint jasperPrint = generateJasperPrint(jasperFilePath, parameters, compileSubreports,
+        connectionProvider, data);
+    if (expType == ExportType.HTML) {
+      HttpSession session = (HttpSession) parameters.get("HTTP_SESSION");
+      if (session != null) {
+        session.setAttribute(ImageServlet.DEFAULT_JASPER_PRINT_SESSION_ATTRIBUTE, jasperPrint);
+      }
+    }
+    try {
+      saveReport(jasperPrint, expType, exportParameters, target);
+    } catch (JRException e) {
+      log.error("Error generating Jasper Report: " + jasperFilePath, e);
+      throw new OBException(e.getMessage(), e);
+    } finally {
+      // remove virtualizer tmp files if we created them
+      if (virtualizer != null) {
+        virtualizer.cleanup();
+      }
+    }
+  }
+
+  /**
+   * Exports the report to an output stream.
+   * 
+   * @param jasperFilePath
+   *          The path to the JR template of the report.
+   * @param expType
+   *          The desired output type of the report.
+   * @param parameters
+   *          The parameters to be sent to Jasper Report.
+   * @param outputStream
+   *          An output stream used to return the report.
+   * @param addProcessDefinitionParameters
+   *          A flag to indicate if the parameters needed to print a report from a Process
+   *          Definition should be added.
+   * @param connectionProvider
+   *          A connection provider in case the report needs it.
+   * @param data
+   *          The data to be used in the report, if required.
+   * @param additionalExportParameters
+   *          Additional export parameters than can be added to configure the resulting report.
+   * @param compileSubreports
+   *          A flag to indicate if the sub-reports should be compiled too. If true, the sub-report
+   *          jrxml files should be placed in the same folder as the main report and their name
+   *          should start with SUBREP_
+   * @throws OBException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  public static void exportJR(String jasperFilePath, ExportType expType,
+      Map<String, Object> parameters, OutputStream outputStream,
+      boolean addProcessDefinitionParameters, ConnectionProvider connectionProvider,
+      JRDataSource data, Map<Object, Object> additionalExportParameters, boolean compileSubreports)
+      throws OBException {
+
+    JRSwapFileVirtualizer virtualizer = null;
+    Map<Object, Object> exportParameters = new HashMap<Object, Object>();
+    parameters.putAll(expType.getExportParameters());
+    if (additionalExportParameters != null && additionalExportParameters.size() > 0) {
+      exportParameters.putAll(additionalExportParameters);
+    }
+    // if no custom virtualizer is requested use a default one
+    if (!parameters.containsKey(JRParameter.REPORT_VIRTUALIZER)) {
+      // virtualizer is essentially using a tmp-file to avoid huge memory consumption by jasper
+      // when processing big reports
+      JRSwapFile swap = new JRSwapFile(getTempFolder(), 4096, 1);
+      // start using the virtualizer when having more than 100 pages of data
+      virtualizer = new JRSwapFileVirtualizer(100, swap);
+      parameters.put(JRParameter.REPORT_VIRTUALIZER, virtualizer);
+    }
+    if (addProcessDefinitionParameters) {
+      addProcessDefinitionParameters(parameters);
+    }
+    JasperPrint jasperPrint = generateJasperPrint(jasperFilePath, parameters, compileSubreports,
+        connectionProvider, data);
+    if (expType == ExportType.HTML) {
+      HttpSession session = (HttpSession) parameters.get("HTTP_SESSION");
+      if (session != null) {
+        session.setAttribute(ImageServlet.DEFAULT_JASPER_PRINT_SESSION_ATTRIBUTE, jasperPrint);
+      }
+    }
+    try {
+      saveReport(jasperPrint, expType, exportParameters, outputStream);
+    } catch (JRException e) {
+      log.error("Error generating Jasper Report: " + jasperFilePath, e);
+      throw new OBException(e.getMessage(), e);
+    } finally {
+      // remove virtualizer tmp files if we created them
+      if (virtualizer != null) {
+        virtualizer.cleanup();
+      }
+    }
+  }
+
+  /**
+   * Saves a pre-compiled report into a file.
+   * 
+   * @param jasperPrint
+   *          JasperPrint object which contains a compiled report.
+   * @param expType
+   *          The desired output type of the report.
+   * @param exportParameters
+   *          Export parameters than can be added to configure the resulting report.
+   * @param target
+   *          The file used to return the report.
+   * @throws JRException
+   *           In case there is any error saving the report an exception is thrown with the error
    *           message.
    */
-  public static void exportJR(String jasperFilePath, ExportType expType,
-      Map<String, Object> parameters, String strFileName) throws OBException {
+  public static void saveReport(JasperPrint jasperPrint, ExportType expType,
+      Map<Object, Object> exportParameters, File target) throws JRException {
+    switch (expType) {
+    case CSV:
+      saveCsvReportToFile(jasperPrint, target);
+      break;
+    case HTML:
+      if (log.isDebugEnabled())
+        log.debug("JR: Print HTML");
+      saveHTMLReportToFile(jasperPrint, exportParameters, target);
+      break;
+    case PDF:
+      JasperExportManager.exportReportToPdfFile(jasperPrint, target.getAbsolutePath());
+      break;
+    case XLS:
+      saveExcelReportToFile(jasperPrint, exportParameters, target);
+      break;
+    case XML:
+      JasperExportManager.exportReportToXmlFile(jasperPrint, target.getAbsolutePath(), true);
+      break;
+    }
+  }
 
-    JRSwapFileVirtualizer virtualizer = null;
+  /**
+   * Returns a pre-compiled report into an Output Stream.
+   * 
+   * @param jasperPrint
+   *          JasperPrint object which contains a compiled report.
+   * @param expType
+   *          The desired output type of the report.
+   * @param exportParameters
+   *          Export parameters than can be added to configure the resulting report.
+   * @param outputStream
+   *          The output stream used to return the report.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  public static void saveReport(JasperPrint jasperPrint, ExportType expType,
+      Map<Object, Object> exportParameters, OutputStream outputStream) throws JRException {
+    switch (expType) {
+    case CSV:
+      saveCsvReportToOutputStream(jasperPrint, outputStream);
+      break;
+    case HTML:
+      if (log.isDebugEnabled())
+        log.debug("JR: Print HTML");
+      saveHTMLReportToOutputStream(jasperPrint, exportParameters, outputStream);
+      break;
+    case PDF:
+      JasperExportManager.exportReportToPdfStream(jasperPrint, outputStream);
+      break;
+    case XLS:
+      saveExcelReportToOutputStream(jasperPrint, exportParameters, outputStream);
+      break;
+    case XML:
+      JasperExportManager.exportReportToXmlStream(jasperPrint, outputStream);
+      break;
+    }
+  }
+
+  /**
+   * Generates an HTML report from a pre-compiled report and returns it into a file.
+   * 
+   * @param jasperPrint
+   *          JasperPrint object which contains a compiled report.
+   * @param exportParameters
+   *          Export parameters than can be added to configure the resulting report.
+   * @param file
+   *          The file used to return the report.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  private static void saveHTMLReportToFile(JasperPrint jasperPrint,
+      Map<Object, Object> exportParameters, File file) throws JRException {
+    final HtmlExporter htmlExporter = new HtmlExporter();
+    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+    SimpleHtmlExporterOutput exporterOutput = new SimpleHtmlExporterOutput(file);
+
+    if (exportParameters != null && exportParameters.size() > 0) {
+      SimpleHtmlReportConfiguration exportConfiguration = new SimpleHtmlReportConfiguration();
+      setHtmlConfigurationFromExportParameters(exportParameters, exportConfiguration,
+          exporterOutput);
+      htmlExporter.setConfiguration(exportConfiguration);
+    } else {
+      SimpleHtmlReportConfiguration reportExportConfiguration = new SimpleHtmlReportConfiguration();
+      reportExportConfiguration.setSizeUnit(HtmlSizeUnitEnum.POINT);
+      htmlExporter.setConfiguration(reportExportConfiguration);
+    }
+    htmlExporter.setExporterInput(exporterInput);
+    htmlExporter.setExporterOutput(exporterOutput);
+    htmlExporter.exportReport();
+  }
+
+  /**
+   * Generates an HTML report from a pre-compiled report and returns it into an output stream.
+   * 
+   * @param jasperPrint
+   *          JasperPrint object which contains a compiled report.
+   * @param exportParameters
+   *          Export parameters than can be added to configure the resulting report.
+   * @param outputStream
+   *          The output stream used to return the report.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  private static void saveHTMLReportToOutputStream(JasperPrint jasperPrint,
+      Map<Object, Object> exportParameters, OutputStream outputStream) throws JRException {
+    final HtmlExporter htmlExporter = new HtmlExporter();
+    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+    SimpleHtmlExporterOutput exporterOutput = new SimpleHtmlExporterOutput(outputStream);
+
+    if (exportParameters != null && exportParameters.size() > 0) {
+      SimpleHtmlReportConfiguration exportConfiguration = new SimpleHtmlReportConfiguration();
+      setHtmlConfigurationFromExportParameters(exportParameters, exportConfiguration,
+          exporterOutput);
+      htmlExporter.setConfiguration(exportConfiguration);
+    } else {
+      SimpleHtmlReportConfiguration reportExportConfiguration = new SimpleHtmlReportConfiguration();
+      reportExportConfiguration.setSizeUnit(HtmlSizeUnitEnum.POINT);
+      htmlExporter.setConfiguration(reportExportConfiguration);
+    }
+    htmlExporter.setExporterInput(exporterInput);
+    htmlExporter.setExporterOutput(exporterOutput);
     try {
-      parameters.put(JASPER_PARAM_HBSESSION, OBDal.getInstance().getSession());
-      parameters.put(JASPER_PARAM_OBCONTEXT, OBContext.getOBContext());
-      parameters.putAll(expType.getExportParameters());
+      htmlExporter.exportReport();
+    } catch (Exception e) {
+      // Handle the exception to ignore the error thrown when the user closes the browser before
+      // getting the whole HTML report
+      Throwable t = e.getCause();
+      if (t != null && !(t.toString().contains("ClientAbortException"))) {
+        throw new JRException(e.getMessage(), e);
+      }
+    }
+  }
 
-      {
-        final FormatDefinition reportFormat = UIDefinitionController.getInstance()
-            .getFormatDefinition("amount", UIDefinitionController.NORMALFORMAT_QUALIFIER);
+  /**
+   * Generates an HTML report using the SimpleExporterInput, SimpleHtmlExporterOutput and
+   * SimpleHtmlReportConfiguration received as parameters.
+   * 
+   * @param exporterInput
+   *          SimpleExporterInput object with the input data.
+   * @param exporterOutput
+   *          SimpleHtmlExporterOutput object with the output data.
+   * @param exportConfiguration
+   *          SimpleHtmlReportConfiguration with the configuration data.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  public static void saveHTMLReport(SimpleExporterInput exporterInput,
+      SimpleHtmlExporterOutput exporterOutput, SimpleHtmlReportConfiguration exportConfiguration)
+      throws JRException {
+    final HtmlExporter htmlExporter = new HtmlExporter();
+    htmlExporter.setExporterInput(exporterInput);
+    htmlExporter.setExporterOutput(exporterOutput);
+    htmlExporter.setConfiguration(exportConfiguration);
+    htmlExporter.exportReport();
+  }
 
-        final DecimalFormatSymbols dfs = new DecimalFormatSymbols();
-        dfs.setDecimalSeparator(reportFormat.getDecimalSymbol().charAt(0));
-        dfs.setGroupingSeparator(reportFormat.getGroupingSymbol().charAt(0));
+  /**
+   * Generates an XLS report from a pre-compiled report and returns it into a file.
+   * 
+   * @param jasperPrint
+   *          JasperPrint object which contains a compiled report.
+   * @param exportParameters
+   *          Export parameters than can be added to configure the resulting report.
+   * @param file
+   *          The file used to return the report.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  private static void saveExcelReportToFile(JasperPrint jasperPrint,
+      Map<Object, Object> exportParameters, File file) throws JRException {
+    final JRXlsExporter excelExporter = new JRXlsExporter();
+    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+    SimpleOutputStreamExporterOutput exporterOutput = new SimpleOutputStreamExporterOutput(file);
 
-        final DecimalFormat numberFormat = new DecimalFormat(correctMaskForGrouping(
-            reportFormat.getFormat(), reportFormat.getDecimalSymbol(),
-            reportFormat.getGroupingSymbol()), dfs);
-        parameters.put("AMOUNTFORMAT", numberFormat);
+    if (exportParameters != null && exportParameters.size() > 0) {
+      SimpleXlsReportConfiguration exportConfiguration = getXlsConfigurationFromExportParameters(exportParameters);
+      excelExporter.setConfiguration(exportConfiguration);
+    } else {
+      SimpleXlsReportConfiguration reportExportConfiguration = new SimpleXlsReportConfiguration();
+      reportExportConfiguration.setOnePagePerSheet(false);
+      reportExportConfiguration.setRemoveEmptySpaceBetweenRows(true);
+      reportExportConfiguration.setDetectCellType(true);
+      excelExporter.setConfiguration(reportExportConfiguration);
+    }
+    excelExporter.setExporterInput(exporterInput);
+    excelExporter.setExporterOutput(exporterOutput);
+    excelExporter.exportReport();
+  }
+
+  /**
+   * Generates an XLS report from a pre-compiled report and returns it into an output stream.
+   * 
+   * @param jasperPrint
+   *          JasperPrint object which contains a compiled report.
+   * @param exportParameters
+   *          Export parameters than can be added to configure the resulting report.
+   * @param outputStream
+   *          The output stream used to return the report.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  private static void saveExcelReportToOutputStream(JasperPrint jasperPrint,
+      Map<Object, Object> exportParameters, OutputStream outputStream) throws JRException {
+    final JRXlsExporter excelExporter = new JRXlsExporter();
+    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+    SimpleOutputStreamExporterOutput exporterOutput = new SimpleOutputStreamExporterOutput(
+        outputStream);
+
+    if (exportParameters != null && exportParameters.size() > 0) {
+      SimpleXlsReportConfiguration exportConfiguration = getXlsConfigurationFromExportParameters(exportParameters);
+      excelExporter.setConfiguration(exportConfiguration);
+    } else {
+      SimpleXlsReportConfiguration reportExportConfiguration = new SimpleXlsReportConfiguration();
+      reportExportConfiguration.setOnePagePerSheet(false);
+      reportExportConfiguration.setRemoveEmptySpaceBetweenRows(true);
+      reportExportConfiguration.setDetectCellType(true);
+      excelExporter.setConfiguration(reportExportConfiguration);
+    }
+    excelExporter.setExporterInput(exporterInput);
+    excelExporter.setExporterOutput(exporterOutput);
+    excelExporter.exportReport();
+  }
+
+  /**
+   * Generates an XLS report using the SimpleExporterInput, SimpleOutputStreamExporterOutput and
+   * SimpleXlsReportConfiguration received as parameters.
+   * 
+   * @param exporterInput
+   *          SimpleExporterInput object with the input data.
+   * @param exporterOutput
+   *          SimpleOutputStreamExporterOutput object with the output data.
+   * @param exportConfiguration
+   *          SimpleXlsReportConfiguration with the configuration data.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  public static void saveExcelReport(SimpleExporterInput exporterInput,
+      SimpleOutputStreamExporterOutput exporterOutput,
+      SimpleXlsReportConfiguration exportConfiguration) throws JRException {
+    final JRXlsExporter excelExporter = new JRXlsExporter();
+    excelExporter.setExporterInput(exporterInput);
+    excelExporter.setExporterOutput(exporterOutput);
+    excelExporter.setConfiguration(exportConfiguration);
+    excelExporter.exportReport();
+  }
+
+  /**
+   * Generates a CSV report from a pre-compiled report and returns it into a file.
+   * 
+   * @param jasperPrint
+   *          JasperPrint object which contains a compiled report.
+   * @param file
+   *          The file used to return the report.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  private static void saveCsvReportToFile(JasperPrint jasperPrint, File file) throws JRException {
+    final JRCsvExporter csvExporter = new JRCsvExporter();
+    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+    SimpleWriterExporterOutput exporterOutput = new SimpleWriterExporterOutput(file);
+
+    csvExporter.setConfiguration(new SimpleCsvReportConfiguration());
+    csvExporter.setExporterInput(exporterInput);
+    csvExporter.setExporterOutput(exporterOutput);
+    csvExporter.exportReport();
+  }
+
+  /**
+   * Generates a CSV report from a pre-compiled report and returns it into an output stream.
+   * 
+   * @param jasperPrint
+   *          JasperPrint object which contains a compiled report.
+   * @param outputStream
+   *          The output stream used to return the report.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  private static void saveCsvReportToOutputStream(JasperPrint jasperPrint, OutputStream outputStream)
+      throws JRException {
+    final JRCsvExporter csvExporter = new JRCsvExporter();
+    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+    SimpleWriterExporterOutput exporterOutput = new SimpleWriterExporterOutput(outputStream);
+
+    csvExporter.setConfiguration(new SimpleCsvReportConfiguration());
+    csvExporter.setExporterInput(exporterInput);
+    csvExporter.setExporterOutput(exporterOutput);
+    csvExporter.exportReport();
+  }
+
+  /**
+   * Generates a CSV report using the SimpleExporterInput, SimpleWriterExporterOutput and
+   * SimpleCsvReportConfiguration received as parameters.
+   * 
+   * @param exporterInput
+   *          SimpleExporterInput object with the input data.
+   * @param exporterOutput
+   *          SimpleWriterExporterOutput object with the output data.
+   * @param exportConfiguration
+   *          SimpleCsvReportConfiguration with the configuration data.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  public static void saveCsvReport(SimpleExporterInput exporterInput,
+      SimpleWriterExporterOutput exporterOutput, SimpleCsvReportConfiguration exportConfiguration)
+      throws JRException {
+    final JRCsvExporter csvExporter = new JRCsvExporter();
+    csvExporter.setExporterInput(exporterInput);
+    csvExporter.setExporterOutput(exporterOutput);
+    csvExporter.setConfiguration(exportConfiguration);
+    csvExporter.exportReport();
+  }
+
+  /**
+   * Generates a SimpleXlsReportConfiguration from a parameter map.
+   * 
+   * This method allows backwards compatibility when generating XLS reports by using a parameter map
+   * to define the export configuration. The usage of this parameter map is deprecated in the Jasper
+   * Reports library to use the SimpleXlsReportConfiguration class instead.
+   * 
+   * @param params
+   *          A parameter map with the export parameters.
+   * @return A SimpleXlsReportConfiguration object with the resulting configuration.
+   * 
+   */
+  @SuppressWarnings("deprecation")
+  private static SimpleXlsReportConfiguration getXlsConfigurationFromExportParameters(
+      Map<Object, Object> params) {
+    SimpleXlsReportConfiguration configuration = new SimpleXlsReportConfiguration();
+    for (Entry<Object, Object> pair : params.entrySet()) {
+      Object key = pair.getKey();
+      String parameter;
+      if (key instanceof net.sf.jasperreports.engine.JRExporterParameter) {
+        parameter = ((net.sf.jasperreports.engine.JRExporterParameter) key).toString();
+      } else if (key instanceof String) {
+        parameter = (String) key;
+      } else {
+        parameter = "";
       }
+      if (parameter.equals("Is One Page per Sheet")) {
+        configuration.setOnePagePerSheet((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Remove Empty Space Between Rows")) {
+        configuration.setRemoveEmptySpaceBetweenRows((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Remove Empty Space Between Columns")) {
+        configuration.setRemoveEmptySpaceBetweenColumns((Boolean) pair.getValue());
+      } else if (parameter.equals("Is White Page Background")) {
+        configuration.setWhitePageBackground((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Detect Cell Type")) {
+        configuration.setDetectCellType((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Font Size Fix Enabled")) {
+        configuration.setFontSizeFixEnabled((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Image Border Fix Enabled")) {
+        configuration.setImageBorderFixEnabled((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Ignore Graphics")) {
+        configuration.setIgnoreGraphics((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Collapse Row Span")) {
+        configuration.setCollapseRowSpan((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Ignore Cell Border")) {
+        configuration.setIgnoreCellBorder((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Ignore Cell Background")) {
+        configuration.setIgnoreCellBackground((Boolean) pair.getValue());
+      } else if (parameter.equals("Maximum Rows Per Sheet")) {
+        configuration.setMaxRowsPerSheet((Integer) pair.getValue());
+      } else if (parameter.equals("Ignore page margins")) {
+        configuration.setIgnorePageMargins((Boolean) pair.getValue());
+      } else {
+        log.warn("Unknown XLS export configuration parameter: " + parameter);
+      }
+    }
+    return configuration;
+  }
 
-      {
-        final FormatDefinition reportFormat = UIDefinitionController.getInstance()
-            .getFormatDefinition("generalQty", UIDefinitionController.SHORTFORMAT_QUALIFIER);
+  /**
+   * Configures a SimpleHtmlReportConfiguration and a SimpleHtmlExporterOutput from a parameter map.
+   * 
+   * This method allows backwards compatibility when generating HTML reports by using a parameter
+   * map to define the export configuration. The usage of this parameter map is deprecated in the
+   * Jasper Reports library to use the SimpleHtmlReportConfiguration and SimpleHtmlExporterOutput
+   * classes instead.
+   * 
+   * @param params
+   *          A parameter map with the export parameters.
+   * @param configuration
+   *          The SimpleHtmlReportConfiguration object generated based on the parameter map.
+   * @param exporterOutput
+   *          The SimpleHtmlExporterOutput object generated based on the parameter map.
+   * 
+   */
+  @SuppressWarnings("deprecation")
+  private static void setHtmlConfigurationFromExportParameters(Map<Object, Object> params,
+      SimpleHtmlReportConfiguration configuration, SimpleHtmlExporterOutput exporterOutput) {
+    // Add configuration defaults
+    // This is needed just in case the params map only contains the Images URI parameter
+    configuration.setSizeUnit(HtmlSizeUnitEnum.POINT);
+    for (Entry<Object, Object> pair : params.entrySet()) {
+      Object key = pair.getKey();
+      String parameter;
+      if (key instanceof net.sf.jasperreports.engine.JRExporterParameter) {
+        parameter = ((net.sf.jasperreports.engine.JRExporterParameter) key).toString();
+      } else if (key instanceof String) {
+        parameter = (String) key;
+      } else {
+        parameter = "";
+      }
+      if (parameter.equals(IMAGES_URI)) {
+        exporterOutput.setImageHandler(new WebHtmlResourceHandler((String) pair.getValue()));
+      } else if (parameter.equals("Is Remove Empty Space Between Rows")) {
+        configuration.setRemoveEmptySpaceBetweenRows((Boolean) pair.getValue());
+      } else if (parameter.equals("Size Unit")) {
+        String sizeUnit = (String) pair.getValue();
+        if (HtmlSizeUnitEnum.POINT.getName().equals(sizeUnit)) {
+          configuration.setSizeUnit(HtmlSizeUnitEnum.POINT);
+        } else if (HtmlSizeUnitEnum.PIXEL.getName().equals(sizeUnit)) {
+          configuration.setSizeUnit(HtmlSizeUnitEnum.PIXEL);
+        }
+      } else if (parameter.equals("Ignore page margins")) {
+        configuration.setIgnorePageMargins((Boolean) pair.getValue());
+      } else if (parameter.equals("Is White Page Background")) {
+        configuration.setWhitePageBackground((Boolean) pair.getValue());
+      } else if (parameter.equals("Is Wrap Break Word")) {
+        configuration.setWrapBreakWord((Boolean) pair.getValue());
+      } else if (parameter.equals("Zoom Ratio")) {
+        configuration.setZoomRatio((Float) pair.getValue());
+      } else {
+        log.warn("Unknown HTML export configuration parameter: " + parameter);
+      }
+    }
+  }
 
-        final DecimalFormatSymbols dfs = new DecimalFormatSymbols();
-        dfs.setDecimalSeparator(reportFormat.getDecimalSymbol().charAt(0));
-        dfs.setGroupingSeparator(reportFormat.getGroupingSymbol().charAt(0));
+  /**
+   * Generates a compiled, translated and filled report into a JasperPrint object.
+   * 
+   * @param jasperFilePath
+   *          The path to the JR template of the report.
+   * @param parameters
+   *          The parameters to be sent to Jasper Report.
+   * @param compileSubreports
+   *          A flag to indicate if the sub-reports of the report should be compiled too. If true,
+   *          the sub-report jrxml files should be placed in the same folder as the main report and
+   *          their name should start with SUBREP_
+   * @param connectionProvider
+   *          A connection provider in case the report needs it.
+   * @param data
+   *          The data to be used in the report, if required.
+   * @return A JasperPrint object with the compiled, translated and filled report.
+   * @throws OBException
+   *           In case there is any error processing the report an exception is thrown with the
+   *           error message.
+   */
+  public static JasperPrint generateJasperPrint(String jasperFilePath,
+      Map<String, Object> parameters, boolean compileSubreports,
+      ConnectionProvider connectionProvider, JRDataSource data) throws OBException {
 
-        final DecimalFormat numberFormat = new DecimalFormat(correctMaskForGrouping(
-            reportFormat.getFormat(), reportFormat.getDecimalSymbol(),
-            reportFormat.getGroupingSymbol()), dfs);
-        parameters.put("QUANTITYFORMAT", numberFormat);
-      }
-
-      final JRFormatFactory jrFormatFactory = new JRFormatFactory();
-      jrFormatFactory.setDatePattern((OBPropertiesProvider.getInstance().getOpenbravoProperties()
-          .getProperty("dateFormat.java")));
-      parameters.put(JRParameter.REPORT_FORMAT_FACTORY, jrFormatFactory);
-
-      String strClientId = OBContext.getOBContext().getCurrentClient().getId();
-      parameters.put("Current_Client_ID", strClientId);
-      String strOrgs = "";
-      boolean isNotFirst = false;
-      for (String strOrgId : OBContext.getOBContext().getReadableOrganizations()) {
-        if (isNotFirst) {
-          strOrgs += ",";
-        }
-        strOrgs += "'" + strOrgId + "'";
-        isNotFirst = true;
-      }
-      parameters.put("Readable_Organizations", strOrgs);
-
-      // if no custom virtualizer is requested use a default one
-      if (!parameters.containsKey(JRParameter.REPORT_VIRTUALIZER)) {
-        // virtualizer is essentially using a tmp-file to avoid huge memory consumption by jasper
-        // when processing big reports
-        JRSwapFile swap = new JRSwapFile(getTempFolder(), 4096, 1);
-        // start using the virtualizer when having more than 100 pages of data
-        virtualizer = new JRSwapFileVirtualizer(100, swap);
-        parameters.put(JRParameter.REPORT_VIRTUALIZER, virtualizer);
-      }
-
+    JasperPrint jasperPrint = null;
+    String language = OBContext.getOBContext().getLanguage().getLanguage();
+    try {
+      setReportFormatFactory(parameters);
       if (log.isDebugEnabled()) {
         log.debug("list of parameters available in the jasper report");
         for (Iterator<String> keys = parameters.keySet().iterator(); keys.hasNext();) {
@@ -150,56 +798,340 @@
         }
       }
 
-      JasperPrint jasperPrint = null;
       if (jasperFilePath.endsWith("jrxml")) {
         String strBaseDesign = DalContextListener.getServletContext().getRealPath("");
-        JasperReport jReport = Utility.getTranslatedJasperReport(new DalConnectionProvider(false),
-            jasperFilePath, OBContext.getOBContext().getLanguage().getLanguage(), strBaseDesign);
-        jasperPrint = JasperFillManager.fillReport(jReport, parameters, OBDal.getInstance()
-            .getConnection());
-
+        JasperReport jReport = getTranslatedJasperReport(new DalConnectionProvider(false),
+            jasperFilePath, language, strBaseDesign);
+        if (connectionProvider != null) {
+          if (compileSubreports) {
+            processSubReports(jasperFilePath, parameters, strBaseDesign, connectionProvider,
+                language);
+          }
+          Connection con = null;
+          try {
+            con = connectionProvider.getTransactionConnection();
+            if (data != null) {
+              parameters.put("REPORT_CONNECTION", con);
+              jasperPrint = JasperFillManager.fillReport(jReport, parameters, data);
+            } else {
+              jasperPrint = JasperFillManager.fillReport(jReport, parameters, con);
+            }
+          } catch (final Exception e) {
+            Throwable t = (e.getCause() != null) ? e.getCause().getCause() : null;
+            if (t != null) {
+              throw new OBException((t instanceof SQLException && t.getMessage().contains(
+                  "@NoConversionRate@")) ? t.getMessage() : e.getMessage(), e);
+            } else {
+              throw new OBException(e.getCause() instanceof SQLException ? e.getCause()
+                  .getMessage() : e.getMessage(), e);
+            }
+          } finally {
+            try {
+              connectionProvider.releaseRollbackConnection(con);
+            } catch (SQLException e) {
+            }
+          }
+        } else {
+          jasperPrint = JasperFillManager.fillReport(jReport, parameters, OBDal.getInstance()
+              .getConnection());
+        }
       } else {
         jasperPrint = JasperFillManager.fillReport(jasperFilePath, parameters);
       }
-      File target = new File(getTempFolder(), strFileName);
-
-      switch (expType) {
-      case PDF:
-        JasperExportManager.exportReportToPdfFile(jasperPrint, target.getAbsolutePath());
-        break;
-      case XLS:
-        JExcelApiExporter exporter = new JExcelApiExporter();
-        Map<Object, Object> exportParameters = new HashMap<Object, Object>();
-        exportParameters.put(JRExporterParameter.JASPER_PRINT, jasperPrint);
-        exportParameters.put(JRExporterParameter.OUTPUT_FILE_NAME, target.getAbsolutePath());
-        exportParameters.put(JExcelApiExporterParameter.IS_ONE_PAGE_PER_SHEET, Boolean.FALSE);
-        exportParameters.put(JExcelApiExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS,
-            Boolean.TRUE);
-        exportParameters.put(JExcelApiExporterParameter.IS_DETECT_CELL_TYPE, true);
-        exporter.setParameters(exportParameters);
-        exporter.exportReport();
-        break;
-      }
+      return jasperPrint;
     } catch (JRException e) {
       log.error("Error generating Jasper Report: " + jasperFilePath, e);
       throw new OBException(e.getMessage(), e);
-    } finally {
-      // remove virtualizer tmp files if we created them
-      if (virtualizer != null) {
-        virtualizer.cleanup();
+    }
+  }
+
+  /**
+   * Generates sub-reports and adds them into the parameter map.
+   * 
+   * @param templateFile
+   *          The path to the JR template of the report.
+   * @param parameters
+   *          The parameters to be sent to Jasper Report.
+   * @param baseDesignPath
+   *          Base design path.
+   * @param connectionProvider
+   *          A connection provider in case the report needs it.
+   * @param language
+   *          Language to be used when generating the sub-report.
+   * @throws OBException
+   *           In case there is any error generating the sub-reports an exception is thrown with the
+   *           error message.
+   */
+  private static void processSubReports(String templateFile, Map<String, Object> parameters,
+      String baseDesignPath, ConnectionProvider connectionProvider, String language)
+      throws OBException {
+    try {
+      JasperDesign jasperDesign = JRXmlLoader.load(templateFile);
+
+      Object[] parameterList = jasperDesign.getParametersList().toArray();
+      String parameterName = "";
+      String subReportName = "";
+      Collection<String> subreportList = new ArrayList<String>();
+      File template = new File(templateFile);
+      String templateLocation = template.getParent() + "/";
+
+      /*
+       * TODO: At present this process assumes the subreport is a .jrxml file. Need to handle the
+       * possibility that this subreport file could be a .jasper file.
+       */
+      for (int i = 0; i < parameterList.length; i++) {
+        final JRDesignParameter parameter = (JRDesignParameter) parameterList[i];
+        if (parameter.getName().startsWith("SUBREP_")) {
+          parameterName = parameter.getName();
+          subreportList.add(parameterName);
+          subReportName = Replace.replace(parameterName, "SUBREP_", "") + ".jrxml";
+          JasperReport jasperReportLines = createSubReport(templateLocation, subReportName,
+              baseDesignPath, connectionProvider, language);
+          parameters.put(parameterName, jasperReportLines);
+        }
       }
+
+    } catch (final JRException e) {
+      log.error("Error processing subreports for template: " + templateFile, e);
+      throw new OBException(e.getMessage(), e);
     }
   }
 
   /**
+   * Create a translated and compiled sub-report into a JasperReport object.
+   * 
+   * @param templateLocation
+   *          The location of the JR template of the sub-report.
+   * @param subReportFileName
+   *          The name of the sub-report jrxml file.
+   * @param baseDesignPath
+   *          Base design path.
+   * @param connectionProvider
+   *          A connection provider in case the report needs it.
+   * @param language
+   *          Language to be used when generating the sub-report.
+   * @return A JasperReport object with the compiled and translated sub-report.
+   */
+  private static JasperReport createSubReport(String templateLocation, String subReportFileName,
+      String baseDesignPath, ConnectionProvider connectionProvider, String language) {
+    JasperReport jasperReportLines = null;
+    try {
+      jasperReportLines = getTranslatedJasperReport(connectionProvider, templateLocation
+          + subReportFileName, language, baseDesignPath);
+    } catch (final JRException e) {
+      log.error("Error generating subreport: " + subReportFileName, e);
+    }
+    return jasperReportLines;
+  }
+
+  /**
+   * Generates a compiled and translated report to the language passed as parameter.
+   * 
+   * @param conn
+   *          The connection provider used to get the translations.
+   * @param reportName
+   *          The path to the JR template of the report.
+   * @param language
+   *          Language to be used when generating the report.
+   * @param baseDesignPath
+   *          Base design path.
+   * @return A JasperReport object with the compiled and translated report.
+   * @throws JRException
+   *           In case there is any error generating the translated report an exception is thrown
+   *           with the error message.
+   */
+  public static JasperReport getTranslatedJasperReport(ConnectionProvider conn, String reportName,
+      String language, String baseDesignPath) throws JRException {
+
+    log.debug("translate report: " + reportName + " for language: " + language);
+
+    File reportFile = new File(reportName);
+
+    InputStream reportInputStream = null;
+    if (reportFile.exists()) {
+      TranslationHandler handler = new TranslationHandler(conn);
+      handler.prepareFile(reportName, language, reportFile, baseDesignPath);
+      reportInputStream = handler.getInputStream();
+    }
+    JasperDesign jasperDesign;
+    if (reportInputStream != null) {
+      log.debug("Jasper report being created with inputStream.");
+      jasperDesign = JRXmlLoader.load(reportInputStream);
+    } else {
+      log.debug("Jasper report being created with strReportName.");
+      jasperDesign = JRXmlLoader.load(reportName);
+    }
+
+    JasperReport jasperReport = JasperCompileManager.compileReport(jasperDesign);
+
+    return jasperReport;
+  }
+
+  /**
+   * Compiles a jrxml file generating a JasperReport object.
+   * 
+   * @param jasperFilePath
+   *          The path to the JR template of the report.
+   * @return A JasperReport object with the compiled report.
+   * @throws JRException
+   *           In case there is any error compiling the report an exception is thrown with the error
+   *           message.
+   */
+  public static JasperReport compileReport(String jasperFilePath) throws JRException {
+    JasperDesign jasperDesign = JRXmlLoader.load(jasperFilePath);
+    JasperReport jasperReport = JasperCompileManager.compileReport(jasperDesign);
+    return jasperReport;
+  }
+
+  /**
+   * Returns a PDF file into an output stream as result of the concatenation of the JasperPrint
+   * objects list passed as parameter.
+   * 
+   * @param jasperPrintList
+   *          A list of JasperPrint objects.
+   * @param createBookmarks
+   *          A flag to indicate if the document should contain bookmarks, to mark the beginning of
+   *          each individual document that was part of the initial document list.
+   * @param outputStream
+   *          The output stream used for returning the report.
+   * @throws JRException
+   *           In case there is any error compiling the report an exception is thrown with the error
+   *           message.
+   */
+  public static void concatPDFReport(List<JasperPrint> jasperPrintList, boolean createBookmarks,
+      OutputStream outputStream) throws JRException {
+
+    JRPdfExporter exporter = new JRPdfExporter();
+    SimpleOutputStreamExporterOutput exporterOutput = new SimpleOutputStreamExporterOutput(
+        outputStream);
+    SimplePdfExporterConfiguration reportConfiguration = new SimplePdfExporterConfiguration();
+
+    reportConfiguration.setCreatingBatchModeBookmarks(createBookmarks);
+    exporter.setConfiguration(reportConfiguration);
+    exporter.setExporterInput(SimpleExporterInput.getInstance(jasperPrintList));
+    exporter.setExporterOutput(exporterOutput);
+
+    exporter.exportReport();
+  }
+
+  /**
+   * Returns an encrypted PDF file into an output stream as result of the concatenation of the
+   * JasperPrint objects list passed as parameter.
+   * 
+   * @param jasperPrintList
+   *          A list of JasperPrint objects.
+   * @param createBookmarks
+   *          A flag to indicate if the document should contain bookmarks, to mark the beginning of
+   *          each individual document that was part of the initial document list.
+   * @param userPassword
+   *          A String that contains the user password of the resulting document.
+   * @param ownerPassword
+   *          A String that contains the owner password of the resulting document.
+   * @param outputStream
+   *          The output stream used for returning the report.
+   * @throws JRException
+   *           In case there is any error compiling the report an exception is thrown with the error
+   *           message.
+   */
+  public static void concatPDFReportEncrypted(List<JasperPrint> jasperPrintList,
+      boolean createBookmarks, String userPassword, String ownerPassword, OutputStream outputStream)
+      throws JRException {
+
+    JRPdfExporter exporter = new JRPdfExporter();
+    SimpleOutputStreamExporterOutput exporterOutput = new SimpleOutputStreamExporterOutput(
+        outputStream);
+    SimplePdfExporterConfiguration reportConfiguration = new SimplePdfExporterConfiguration();
+
+    reportConfiguration.setEncrypted(true);
+    reportConfiguration.set128BitKey(true);
+    reportConfiguration.setUserPassword(userPassword);
+    reportConfiguration.setOwnerPassword(ownerPassword);
+    reportConfiguration.setCreatingBatchModeBookmarks(createBookmarks);
+    exporter.setConfiguration(reportConfiguration);
+    exporter.setExporterInput(SimpleExporterInput.getInstance(jasperPrintList));
+    exporter.setExporterOutput(exporterOutput);
+
+    exporter.exportReport();
+  }
+
+  /**
+   * Adds the parameters needed to print a report from a standard process definition into the
+   * parameter map.
+   * 
+   * @param parameters
+   *          Map of parameters where the standard process definition parameters are added.
+   */
+  private static void addProcessDefinitionParameters(Map<String, Object> parameters) {
+    parameters.put(JASPER_PARAM_HBSESSION, OBDal.getInstance().getSession());
+    parameters.put(JASPER_PARAM_OBCONTEXT, OBContext.getOBContext());
+
+    {
+      final FormatDefinition reportFormat = UIDefinitionController.getInstance()
+          .getFormatDefinition("amount", UIDefinitionController.NORMALFORMAT_QUALIFIER);
+
+      final DecimalFormatSymbols dfs = new DecimalFormatSymbols();
+      dfs.setDecimalSeparator(reportFormat.getDecimalSymbol().charAt(0));
+      dfs.setGroupingSeparator(reportFormat.getGroupingSymbol().charAt(0));
+
+      final DecimalFormat numberFormat = new DecimalFormat(correctMaskForGrouping(
+          reportFormat.getFormat(), reportFormat.getDecimalSymbol(),
+          reportFormat.getGroupingSymbol()), dfs);
+      parameters.put("AMOUNTFORMAT", numberFormat);
+    }
+
+    {
+      final FormatDefinition reportFormat = UIDefinitionController.getInstance()
+          .getFormatDefinition("generalQty", UIDefinitionController.SHORTFORMAT_QUALIFIER);
+
+      final DecimalFormatSymbols dfs = new DecimalFormatSymbols();
+      dfs.setDecimalSeparator(reportFormat.getDecimalSymbol().charAt(0));
+      dfs.setGroupingSeparator(reportFormat.getGroupingSymbol().charAt(0));
+
+      final DecimalFormat numberFormat = new DecimalFormat(correctMaskForGrouping(
+          reportFormat.getFormat(), reportFormat.getDecimalSymbol(),
+          reportFormat.getGroupingSymbol()), dfs);
+      parameters.put("QUANTITYFORMAT", numberFormat);
+    }
+
+    String strClientId = OBContext.getOBContext().getCurrentClient().getId();
+    parameters.put("Current_Client_ID", strClientId);
+    String strOrgs = "";
+    boolean isNotFirst = false;
+    for (String strOrgId : OBContext.getOBContext().getReadableOrganizations()) {
+      if (isNotFirst) {
+        strOrgs += ",";
+      }
+      strOrgs += "'" + strOrgId + "'";
+      isNotFirst = true;
+    }
+    parameters.put("Readable_Organizations", strOrgs);
+  }
+
+  /**
+   * Adds the date format configuration into the parameter map.
+   * 
+   * @param parameters
+   *          Map of parameters where the date format configuration is put.
+   */
+  private static void setReportFormatFactory(Map<String, Object> parameters) {
+    String javaDateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties()
+        .getProperty("dateFormat.java");
+    if (log.isDebugEnabled())
+      log.debug("creating the format factory: " + javaDateFormat);
+    final JRFormatFactory jrFormatFactory = new JRFormatFactory();
+    jrFormatFactory.setDatePattern(javaDateFormat);
+    parameters.put(JRParameter.REPORT_FORMAT_FACTORY, jrFormatFactory);
+  }
+
+  /**
    * Changes the mask to use "." as Decimal Symbol and "," as grouping symbol.
    * 
    * @param mask
-   *          the current mask
+   *          the current mask.
    * @param decimalSymbol
-   *          the current decimal symbol
+   *          the current decimal symbol.
    * @param groupingSymbol
-   *          the current grouping symbol
+   *          the current grouping symbol.
    * @return the mask with the updated decimal and grouping symbols.
    */
   private static String correctMaskForGrouping(String mask, String decimalSymbol,
@@ -215,17 +1147,56 @@
    * is generated.
    */
   public enum ExportType {
+    // When IS_IGNORE_PAGINATION is set to true, the report-filling engine will generate the
+    // document on a single, very long page. Running the generated report to any output format, a
+    // single page document will be visualized. This is the desired behavior for some document
+    // types, such as HTML, XML or XLS.
+    // This flag should be false for documents with page-oriented layout, like PDF, to allow the
+    // possibility to navigate between pages.
+    /**
+     * CSV export type
+     */
+    @SuppressWarnings("serial")
+    CSV("csv", "", new HashMap<String, Object>() {
+      {
+        put("IS_IGNORE_PAGINATION", true);
+      }
+    }), //
+    /**
+     * HTML export type
+     */
+    @SuppressWarnings("serial")
+    HTML("html", "", new HashMap<String, Object>() {
+      {
+        put("IS_IGNORE_PAGINATION", true);
+      }
+    }), //
+    /**
+     * PDF export type
+     */
     @SuppressWarnings("serial")
     PDF("pdf", "103", new HashMap<String, Object>() {
       {
         put("IS_IGNORE_PAGINATION", false);
       }
     }), //
+    /**
+     * XLS export type
+     */
     @SuppressWarnings("serial")
     XLS("xls", "101", new HashMap<String, Object>() {
       {
         put("IS_IGNORE_PAGINATION", true);
       }
+    }), //
+    /**
+     * XML export type
+     */
+    @SuppressWarnings("serial")
+    XML("xml", "800004", new HashMap<String, Object>() {
+      {
+        put("IS_IGNORE_PAGINATION", true);
+      }
     });
     private final String extension;
     private final String fileType;
@@ -239,7 +1210,11 @@
         if (type != null) {
           fileType = type.getFormat();
         } else {
-          fileType = "application/" + extension;
+          if ("html".equals(extension) || "csv".equals(extension)) {
+            fileType = "text/" + extension;
+          } else {
+            fileType = "application/" + extension;
+          }
         }
       } finally {
         OBContext.restorePreviousMode();
@@ -247,14 +1222,23 @@
       this.params = params;
     }
 
+    /**
+     * @return a String with the extension type.
+     */
     public String getExtension() {
       return this.extension;
     }
 
+    /**
+     * @return a String with the content type.
+     */
     public String getContentType() {
       return fileType;
     }
 
+    /**
+     * @return a map with the configuration parameters.
+     */
     public Map<String, Object> getExportParameters() {
       // An instance of the Map is done for making sure
       // that if this method is called, it is only accessing
@@ -264,18 +1248,39 @@
 
     /**
      * Returns the corresponding ExportType item based on the action.
+     * 
+     * @param action
+     *          a String that defines the export type.
+     * @return the ExportType associated to the input String parameter.
+     * @throws OBException
+     *           In case the input String parameter does not correspond with any valid ExportType,
+     *           an exception is thrown with the error message.
      */
     public static ExportType getExportType(String action) throws OBException {
-      if ("PDF".equals(action)) {
+      if ("CSV".equals(action)) {
+        return ExportType.CSV;
+      } else if ("HTML".equals(action)) {
+        return ExportType.HTML;
+      } else if ("PDF".equals(action)) {
         return ExportType.PDF;
       } else if ("XLS".equals(action)) {
         return ExportType.XLS;
+      } else if ("XML".equals(action)) {
+        return ExportType.XML;
       } else {
-        throw new OBException(OBMessageUtils.messageBD("OBUIAPP_UnsupportedAction"));
+        throw new OBException(OBMessageUtils.getI18NMessage("OBUIAPP_UnsupportedAction",
+            new String[] { action }));
       }
     }
 
-    /** Checks if temporary file name is a valid one: has extension and the name is a uuid */
+    /**
+     * Checks if temporary file name is a valid one: has extension and the name is a uuid.
+     * 
+     * @param tmpFileName
+     *          a String with the file name.
+     * 
+     * @return true if the the temporary file name is valid, false otherwise.
+     */
     public boolean isValidTemporaryFileName(String tmpFileName) {
       if (!tmpFileName.endsWith("." + getExtension())) {
         // file name should end with the extension
@@ -289,7 +1294,11 @@
     }
   }
 
-  /** Returns temporary directory to save generated reports */
+  /**
+   * Returns temporary directory to save generated reports.
+   * 
+   * @return a String with the temporary directory location.
+   */
   public static String getTempFolder() {
     final String tmpFolder = System.getProperty("java.io.tmpdir");
 
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PaymentReportExcel" pageWidth="1800" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1740" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PaymentReportExcel" pageWidth="1800" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1740" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="bd54446c-5f03-492f-9be8-1942e896464a">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="2.0"/>
@@ -106,7 +106,7 @@
 	<pageHeader>
 		<band height="50" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-2" style="Detail_Header" x="0" y="25" width="99" height="25"/>
+				<reportElement key="staticText-2" style="Detail_Header" x="0" y="25" width="99" height="25" uuid="e6e8717f-6bda-4439-80f6-c102e6cb73ba"/>
 				<box leftPadding="2"/>
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -114,7 +114,7 @@
 				<text><![CDATA[Business Partner]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-4" style="Detail_Header" x="523" y="25" width="65" height="25"/>
+				<reportElement key="staticText-4" style="Detail_Header" x="523" y="25" width="65" height="25" uuid="13b568de-81b5-4eca-a945-52c116d1e034"/>
 				<box leftPadding="2"/>
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -122,7 +122,7 @@
 				<text><![CDATA[Payment]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-5" style="Detail_Header" x="335" y="25" width="78" height="25"/>
+				<reportElement key="staticText-5" style="Detail_Header" x="335" y="25" width="78" height="25" uuid="8ad25397-3a53-4b40-9b94-f2e012eed12f"/>
 				<box leftPadding="2"/>
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -130,7 +130,7 @@
 				<text><![CDATA[Sales Person]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-6" style="Detail_Header" x="413" y="25" width="55" height="25"/>
+				<reportElement key="staticText-6" style="Detail_Header" x="413" y="25" width="55" height="25" uuid="32d26128-fc92-44c8-8c80-82a2c0b2cbc0"/>
 				<box leftPadding="2"/>
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -138,7 +138,7 @@
 				<text><![CDATA[Invoice Number]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-7" style="Detail_Header" x="468" y="25" width="55" height="25"/>
+				<reportElement key="staticText-7" style="Detail_Header" x="468" y="25" width="55" height="25" uuid="b62fcb70-a94c-46bc-9e68-030093c18f9d"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -146,7 +146,7 @@
 				<text><![CDATA[Invoice Date]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-8" style="Detail_Header" x="1067" y="25" width="62" height="25"/>
+				<reportElement key="staticText-8" style="Detail_Header" x="1067" y="25" width="62" height="25" uuid="a1b810c6-7079-4137-98fe-e72aef6982b7"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -154,28 +154,28 @@
 				<text><![CDATA[Expected Date]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-9" style="Detail_Header" x="1191" y="25" width="33" height="25"/>
+				<reportElement key="staticText-9" style="Detail_Header" x="1191" y="25" width="33" height="25" uuid="3ffa7d2f-f991-429b-8a4d-f10b883ab18e"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[PlannedDSO]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-10" style="Detail_Header" x="1224" y="25" width="33" height="25"/>
+				<reportElement key="staticText-10" style="Detail_Header" x="1224" y="25" width="33" height="25" uuid="c855e293-66e8-413a-9c5c-53b80f43948e"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[CurrentDSO]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-11" style="Detail_Header" x="1257" y="25" width="36" height="25"/>
+				<reportElement key="staticText-11" style="Detail_Header" x="1257" y="25" width="36" height="25" uuid="c94b49df-3cf9-402b-850d-4e0eafc6344e"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
 				<text><![CDATA[Overdue]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-13" style="Detail_Header" x="1433" y="25" width="80" height="25"/>
+				<reportElement key="staticText-13" style="Detail_Header" x="1433" y="25" width="80" height="25" uuid="b1cf437e-53c3-4907-a195-4e315bbccf75"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font size="8" isBold="false"/>
@@ -183,7 +183,7 @@
 				<text><![CDATA[Base Amount]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-14" style="Detail_Header" x="1513" y="25" width="46" height="25"/>
+				<reportElement key="staticText-14" style="Detail_Header" x="1513" y="25" width="46" height="25" uuid="4365d882-411e-4cb7-b0e0-c09428f13f0d"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false"/>
@@ -191,7 +191,7 @@
 				<text><![CDATA[Base Currency]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-15" style="Detail_Header" x="1293" y="25" width="80" height="25"/>
+				<reportElement key="staticText-15" style="Detail_Header" x="1293" y="25" width="80" height="25" uuid="028e545c-de38-4a28-99a5-630e9845aa20"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font size="8" isBold="false"/>
@@ -199,7 +199,7 @@
 				<text><![CDATA[Transactional Amount]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-16" style="Detail_Header" x="1373" y="25" width="60" height="25"/>
+				<reportElement key="staticText-16" style="Detail_Header" x="1373" y="25" width="60" height="25" uuid="ee068dec-8346-4aa7-bdcf-e22a9e6f3d46"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false"/>
@@ -207,12 +207,11 @@
 				<text><![CDATA[Transactional Currency]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-17" style="Report_Footer" x="0" y="0" width="169" height="25"/>
-				<textElement/>
+				<reportElement key="staticText-17" style="Report_Footer" x="0" y="0" width="169" height="25" uuid="4dc44e84-72ff-45d2-a179-26d390956090"/>
 				<text><![CDATA[Payment Report]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-18" style="Detail_Header" x="99" y="25" width="76" height="25"/>
+				<reportElement key="staticText-18" style="Detail_Header" x="99" y="25" width="76" height="25" uuid="adaa4dd5-76e7-41e8-96da-3e0cce96ec2f"/>
 				<box leftPadding="2"/>
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -220,7 +219,7 @@
 				<text><![CDATA[Business Partner Category]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-19" style="Detail_Header" x="175" y="25" width="76" height="25"/>
+				<reportElement key="staticText-19" style="Detail_Header" x="175" y="25" width="76" height="25" uuid="10f03f84-1332-4806-b09f-c8a9ac8ef8c4"/>
 				<box leftPadding="2"/>
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -228,7 +227,7 @@
 				<text><![CDATA[Status]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-20" style="Detail_Header" x="251" y="25" width="84" height="25"/>
+				<reportElement key="staticText-20" style="Detail_Header" x="251" y="25" width="84" height="25" uuid="9ba2e9e5-a224-46ab-aa50-783b09df9dd2"/>
 				<box leftPadding="2"/>
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -236,7 +235,7 @@
 				<text><![CDATA[Project]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-22" style="Detail_Header" x="760" y="25" width="227" height="25"/>
+				<reportElement key="staticText-22" style="Detail_Header" x="760" y="25" width="227" height="25" uuid="0ee66011-ae94-49f0-b1ce-7410af3da511"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -244,7 +243,7 @@
 				<text><![CDATA[Payment Description]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-25" style="Detail_Header" x="987" y="25" width="80" height="25"/>
+				<reportElement key="staticText-25" style="Detail_Header" x="987" y="25" width="80" height="25" uuid="9bb6525a-2c0b-4995-ba06-459eda71f6b3"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -252,7 +251,7 @@
 				<text><![CDATA[Payment Date]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-14" style="Detail_Header" x="588" y="25" width="172" height="25"/>
+				<reportElement key="staticText-14" style="Detail_Header" x="588" y="25" width="172" height="25" uuid="d853b444-e819-4564-ad71-d9434a778edb"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Left">
 					<font size="8" isBold="false"/>
@@ -260,7 +259,7 @@
 				<text><![CDATA[Payment Method]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-14" style="Detail_Header" x="1559" y="25" width="77" height="25"/>
+				<reportElement key="staticText-14" style="Detail_Header" x="1559" y="25" width="77" height="25" uuid="8f210f70-ea6e-4b5a-a9c6-78ad56be9638"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false"/>
@@ -268,7 +267,7 @@
 				<text><![CDATA[Deposit/Withdraw Date]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-14" style="Detail_Header" x="1636" y="25" width="77" height="25"/>
+				<reportElement key="staticText-14" style="Detail_Header" x="1636" y="25" width="77" height="25" uuid="4c50761f-63bb-4f04-847c-1283d5a21200"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false"/>
@@ -276,7 +275,7 @@
 				<text><![CDATA[Financial Account]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-8" style="Detail_Header" x="1129" y="25" width="62" height="25"/>
+				<reportElement key="staticText-8" style="Detail_Header" x="1129" y="25" width="62" height="25" uuid="3d5a6635-4d0a-4804-a7b9-407c062ce112"/>
 				<box leftPadding="2"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
@@ -291,172 +290,172 @@
 	<detail>
 		<band height="25" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-2" style="Report_Footer" x="0" y="0" width="99" height="25"/>
+				<reportElement key="textField-2" style="Report_Footer" x="0" y="0" width="99" height="25" uuid="623fd7b7-741d-4827-bd0d-2477c5b8c01c"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{BPARTNER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BPARTNER}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-4" style="Report_Footer" x="523" y="0" width="65" height="25"/>
+				<reportElement key="textField-4" style="Report_Footer" x="523" y="0" width="65" height="25" uuid="ca4dd966-492f-4482-bdce-4092007f90e1"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_DOCNO}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{PAYMENT_DOCNO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-5" style="Report_Footer" x="335" y="0" width="78" height="25"/>
+				<reportElement key="textField-5" style="Report_Footer" x="335" y="0" width="78" height="25" uuid="fee5d68f-091c-48d6-8226-7802e06dda51"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{SALES_PERSON}==null ? " " : $F{SALES_PERSON})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{SALES_PERSON}==null ? " " : $F{SALES_PERSON})]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-6" style="Report_Footer" x="413" y="0" width="55" height="25"/>
+				<reportElement key="textField-6" style="Report_Footer" x="413" y="0" width="55" height="25" uuid="c71a9a7c-65ce-4e62-b94d-849852a6de65"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_NUMBER}==null ? " " : $F{INVOICE_NUMBER}.toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{INVOICE_NUMBER}==null ? " " : $F{INVOICE_NUMBER}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-7" style="Report_Footer" x="468" y="0" width="55" height="25"/>
+				<reportElement key="textField-7" style="Report_Footer" x="468" y="0" width="55" height="25" uuid="3b6da8cb-3613-4c05-9eb9-12ba187d9994"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_DATE}== null ? " " : $F{INVOICE_DATE})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{INVOICE_DATE}== null ? " " : $F{INVOICE_DATE})]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-8" style="Report_Footer" x="1067" y="0" width="62" height="25"/>
+				<reportElement key="textField-8" style="Report_Footer" x="1067" y="0" width="62" height="25" uuid="a7c63912-bf1d-4012-a724-e52dd62d334b"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{EXPECTED_DATE}== null ? " " : $F{EXPECTED_DATE})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{EXPECTED_DATE}== null ? " " : $F{EXPECTED_DATE})]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-9" style="Report_Footer" x="1191" y="0" width="33" height="25"/>
+				<reportElement key="textField-9" style="Report_Footer" x="1191" y="0" width="33" height="25" uuid="4ade6f38-a30e-4c1a-9fb3-0750d581141e"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{PLANNED_DSO}== null ? " " : $F{PLANNED_DSO}.toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{PLANNED_DSO}== null ? " " : $F{PLANNED_DSO}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-10" style="Report_Footer" x="1224" y="0" width="33" height="25"/>
+				<reportElement key="textField-10" style="Report_Footer" x="1224" y="0" width="33" height="25" uuid="c294add7-2a46-49de-b576-06a6b041a68b"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{CURRENT_DSO}== null ? " " : $F{CURRENT_DSO}.toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{CURRENT_DSO}== null ? " " : $F{CURRENT_DSO}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-11" style="Report_Footer" x="1257" y="0" width="36" height="25"/>
+				<reportElement key="textField-11" style="Report_Footer" x="1257" y="0" width="36" height="25" uuid="2fe53a7d-a2ef-4c76-bc39-8ccf3db0cd6d"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-13" style="Report_Footer" x="1433" y="0" width="80" height="25"/>
+				<reportElement key="textField-13" style="Report_Footer" x="1433" y="0" width="80" height="25" uuid="469ae18b-601a-4111-a91b-c6aed348c9d2"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{BASE_AMOUNT}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BASE_AMOUNT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-14" style="Report_Footer" x="1513" y="0" width="46" height="25"/>
+				<reportElement key="textField-14" style="Report_Footer" x="1513" y="0" width="46" height="25" uuid="5048cde4-f51d-4ce0-8a89-adc9406901c8"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-15" style="Report_Footer" x="1293" y="0" width="80" height="25"/>
+				<reportElement key="textField-15" style="Report_Footer" x="1293" y="0" width="80" height="25" uuid="82a9b6d9-6055-48b8-9766-36fcea5ef399"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{TRANS_AMOUNT}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{TRANS_AMOUNT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-16" style="Report_Footer" x="1373" y="0" width="60" height="25"/>
+				<reportElement key="textField-16" style="Report_Footer" x="1373" y="0" width="60" height="25" uuid="ff340e8e-63c1-4df9-af58-75c6c7bbabee"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_CURRENCY}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{TRANS_CURRENCY}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-17" style="Report_Footer" x="99" y="0" width="76" height="25"/>
+				<reportElement key="textField-17" style="Report_Footer" x="99" y="0" width="76" height="25" uuid="9ac4381c-d8c0-431f-87b4-aa58f2fe1e03"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{BP_GROUP}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BP_GROUP}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-18" style="Report_Footer" x="175" y="0" width="76" height="25"/>
+				<reportElement key="textField-18" style="Report_Footer" x="175" y="0" width="76" height="25" uuid="656f0e60-baf2-4a38-a9c6-b691546f2ddc"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{STATUS}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{STATUS}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-19" style="Report_Footer" x="251" y="0" width="84" height="25"/>
+				<reportElement key="textField-19" style="Report_Footer" x="251" y="0" width="84" height="25" uuid="eb8de9eb-0b8f-4a0c-ad4e-38cb75011387"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{PROJECT}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{PROJECT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement key="textField-21" style="Report_Footer" stretchType="RelativeToBandHeight" x="760" y="0" width="227" height="25"/>
+				<reportElement key="textField-21" style="Report_Footer" stretchType="RelativeToBandHeight" x="760" y="0" width="227" height="25" uuid="b994b3fe-c40c-4593-b9fa-def60a85e415"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_DESC}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{PAYMENT_DESC}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-22" style="Report_Footer" x="987" y="0" width="80" height="25"/>
+				<reportElement key="textField-22" style="Report_Footer" x="987" y="0" width="80" height="25" uuid="dc82c446-73df-42ca-8bfa-efcc30eb34a2"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.util.Date"><![CDATA[$F{PAYMENT_DATE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{PAYMENT_DATE}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-14" style="Report_Footer" x="588" y="0" width="172" height="25"/>
+				<reportElement key="textField-14" style="Report_Footer" x="588" y="0" width="172" height="25" uuid="4fcec8ca-50da-4a41-85f5-c0323ecdca1e"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_METHOD}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{PAYMENT_METHOD}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-14" style="Report_Footer" x="1559" y="0" width="77" height="25"/>
+				<reportElement key="textField-14" style="Report_Footer" x="1559" y="0" width="77" height="25" uuid="9ba8e0c8-323a-4713-92a9-47bf1fe1fba1"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.util.Date"><![CDATA[$F{DEPOSIT_WITHDRAW_DATE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{DEPOSIT_WITHDRAW_DATE}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-14" style="Report_Footer" x="1636" y="0" width="77" height="25"/>
+				<reportElement key="textField-14" style="Report_Footer" x="1636" y="0" width="77" height="25" uuid="39d37682-307e-45b4-9a5e-4447538e0aa3"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{FINANCIAL_ACCOUNT}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{FINANCIAL_ACCOUNT}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-8" style="Report_Footer" x="1129" y="0" width="62" height="25"/>
+				<reportElement key="textField-8" style="Report_Footer" x="1129" y="0" width="62" height="25" uuid="588bddf7-3d9c-4248-a3b4-d1a6ce9ee3c7"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{DUE_DATE}== null ? " " : $F{DUE_DATE})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{DUE_DATE}== null ? " " : $F{DUE_DATE})]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
@@ -469,7 +468,7 @@
 	<lastPageFooter>
 		<band height="40" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-23" style="Report_Footer" x="1" y="1" width="693" height="17">
+				<reportElement key="staticText-23" style="Report_Footer" x="1" y="1" width="693" height="17" uuid="7fe57978-531b-490b-b97d-069986468006">
 					<printWhenExpression><![CDATA[$P{ONE_ASTERISK_SHOW}]]></printWhenExpression>
 				</reportElement>
 				<textElement>
@@ -478,7 +477,7 @@
 				<text><![CDATA[* Invoice paid using a credit payment]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-24" style="Report_Footer" x="1" y="18" width="693" height="17">
+				<reportElement key="staticText-24" style="Report_Footer" x="1" y="18" width="693" height="17" uuid="54566c7f-f92b-4c52-95ac-8720d909674e">
 					<printWhenExpression><![CDATA[$P{TWO_ASTERISK_SHOW}]]></printWhenExpression>
 				</reportElement>
 				<textElement>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PaymentReportPDF" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PaymentReportPDF" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="a1c562a7-5994-47ae-b89e-6d598ae5c022">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="2.0"/>
@@ -106,28 +106,27 @@
 		<groupHeader>
 			<band height="20" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText-32" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18"/>
+					<reportElement key="staticText-32" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18" uuid="bc403650-a58a-43c5-a904-65e7b94c9655"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Business Partner:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-33" style="Report_Footer" stretchType="RelativeToBandHeight" x="408" y="0" width="179" height="18"/>
+					<reportElement key="staticText-33" style="Report_Footer" stretchType="RelativeToBandHeight" x="408" y="0" width="179" height="18" uuid="9856e06e-8bcb-4287-b570-481264b0dd5c"/>
 					<textElement textAlignment="Right"/>
 					<text><![CDATA[Business Partner Category:]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement key="textField-29" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18"/>
+					<reportElement key="textField-29" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18" uuid="120696b3-3411-4f87-be63-728c76249969"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{BPARTNER_SHOW}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{BPARTNER_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement key="textField-40" style="Report_Footer" stretchType="RelativeToBandHeight" x="593" y="0" width="179" height="18"/>
-					<textElement/>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{BPGROUP_SHOW}.toString()]]></textFieldExpression>
+					<reportElement key="textField-40" style="Report_Footer" stretchType="RelativeToBandHeight" x="593" y="0" width="179" height="18" uuid="d96991aa-2d41-43c8-a9a6-3f267036cf6f"/>
+					<textFieldExpression><![CDATA[$P{BPGROUP_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
@@ -140,28 +139,27 @@
 		<groupHeader>
 			<band height="20" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText-34" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18"/>
+					<reportElement key="staticText-34" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18" uuid="b7f12107-0b2a-46e4-8ca2-6dc67d0aeec8"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Project:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-35" style="Report_Footer" stretchType="RelativeToBandHeight" x="408" y="0" width="179" height="18"/>
+					<reportElement key="staticText-35" style="Report_Footer" stretchType="RelativeToBandHeight" x="408" y="0" width="179" height="18" uuid="dd4a8c26-12dd-465c-b6f0-28a0d3420056"/>
 					<textElement textAlignment="Right"/>
 					<text><![CDATA[Status:]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement key="textField-30" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18"/>
+					<reportElement key="textField-30" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18" uuid="1f76ca46-605a-4c84-8f96-12162946408d"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{PROJECT_SHOW}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{PROJECT_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement key="textField-41" style="Report_Footer" stretchType="RelativeToBandHeight" x="593" y="0" width="179" height="18"/>
-					<textElement/>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{STATUS_SHOW}.toString()]]></textFieldExpression>
+					<reportElement key="textField-41" style="Report_Footer" stretchType="RelativeToBandHeight" x="593" y="0" width="179" height="18" uuid="7ca3cfc3-f649-410d-9582-695ce7afbd04"/>
+					<textFieldExpression><![CDATA[$P{STATUS_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
@@ -174,114 +172,110 @@
 		<groupHeader>
 			<band height="100" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText-50" style="Report_Footer" x="408" y="20" width="179" height="18"/>
+					<reportElement key="staticText-50" style="Report_Footer" x="408" y="20" width="179" height="18" uuid="259ac931-1aa6-4783-b3e0-09733bd29625"/>
 					<textElement textAlignment="Right"/>
 					<text><![CDATA[Include Payments Using Credit:]]></text>
 				</staticText>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-46" style="Report_Footer" x="593" y="20" width="179" height="18"/>
-					<textElement/>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{INCL_PAYMENTUSINGCREDIT}.toString()]]></textFieldExpression>
+					<reportElement key="textField-46" style="Report_Footer" x="593" y="20" width="179" height="18" uuid="78abf757-1c21-4e64-b3d0-4b54d5d5dcab"/>
+					<textFieldExpression><![CDATA[$P{INCL_PAYMENTUSINGCREDIT}.toString()]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-36" style="Report_Footer" x="11" y="40" width="179" height="18"/>
+					<reportElement key="staticText-36" style="Report_Footer" x="11" y="40" width="179" height="18" uuid="5a158a3b-bb8d-4cd4-b813-9195dd85d40d"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Convert to currency:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-37" style="Report_Footer" x="408" y="40" width="179" height="18"/>
+					<reportElement key="staticText-37" style="Report_Footer" x="408" y="40" width="179" height="18" uuid="f03ea278-d098-49c9-8b82-61652837ca8e"/>
 					<textElement textAlignment="Right"/>
 					<text><![CDATA[Conversion Date:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-38" style="Report_Footer" x="11" y="60" width="179" height="18"/>
+					<reportElement key="staticText-38" style="Report_Footer" x="11" y="60" width="179" height="18" uuid="e713543b-9095-45ce-a416-0eeadd2539a0"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Payment Type:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-39" style="Report_Footer" x="408" y="60" width="179" height="18"/>
+					<reportElement key="staticText-39" style="Report_Footer" x="408" y="60" width="179" height="18" uuid="4e232398-5b04-44ad-8715-1f7b8caacc33"/>
 					<textElement textAlignment="Right"/>
 					<text><![CDATA[Overdue:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-41" style="Report_Footer" x="11" y="80" width="179" height="18"/>
+					<reportElement key="staticText-41" style="Report_Footer" x="11" y="80" width="179" height="18" uuid="655fa526-efcb-4b09-9a30-2aefba95aaa9"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Grouping Criteria:]]></text>
 				</staticText>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-31" style="Report_Footer" x="196" y="40" width="179" height="18"/>
+					<reportElement key="textField-31" style="Report_Footer" x="196" y="40" width="179" height="18" uuid="1457b19a-b1c3-401d-9593-c6447c12cf43"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{CONVERT_CURRENCY_SHOW}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{CONVERT_CURRENCY_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-32" style="Report_Footer" x="196" y="60" width="179" height="18"/>
+					<reportElement key="textField-32" style="Report_Footer" x="196" y="60" width="179" height="18" uuid="0172a2f1-1207-48a6-89b6-ba46b2855182"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{PAYMTYPE_SHOW}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{PAYMTYPE_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-33" style="Report_Footer" x="196" y="80" width="179" height="18"/>
+					<reportElement key="textField-33" style="Report_Footer" x="196" y="80" width="179" height="18" uuid="719b4938-3d55-4783-b7ea-7ce7444add00"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{GROUPCRIT_SHOW}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{GROUPCRIT_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-35" style="Report_Footer" x="593" y="60" width="179" height="18"/>
-					<textElement/>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{OVERDUE_SHOW}.toString()]]></textFieldExpression>
+					<reportElement key="textField-35" style="Report_Footer" x="593" y="60" width="179" height="18" uuid="bbc62d24-ecd5-4fea-82cb-71f5e27102ac"/>
+					<textFieldExpression><![CDATA[$P{OVERDUE_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-42" style="Report_Footer" x="593" y="40" width="179" height="18"/>
-					<textElement/>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{CONVERSIONDATE_SHOW}.toString()]]></textFieldExpression>
+					<reportElement key="textField-42" style="Report_Footer" x="593" y="40" width="179" height="18" uuid="d14df83f-dc79-4bfa-b58e-a84e26c6e6ea"/>
+					<textFieldExpression><![CDATA[$P{CONVERSIONDATE_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-47" style="Report_Footer" x="11" y="0" width="179" height="18"/>
+					<reportElement key="staticText-47" style="Report_Footer" x="11" y="0" width="179" height="18" uuid="1af2bac6-ecc3-40de-ac79-be073517ab3a"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Payment Method:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-48" style="Report_Footer" x="408" y="0" width="179" height="18"/>
+					<reportElement key="staticText-48" style="Report_Footer" x="408" y="0" width="179" height="18" uuid="c42c2e46-9ce2-4d12-ad07-8b1646933cc5"/>
 					<textElement textAlignment="Right"/>
 					<text><![CDATA[Financial Account:]]></text>
 				</staticText>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-43" style="Report_Footer" x="196" y="0" width="179" height="18"/>
+					<reportElement key="textField-43" style="Report_Footer" x="196" y="0" width="179" height="18" uuid="022e310b-0d88-41e7-909e-34f6dd1d4c0e"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{PAYMENT_METHOD_SHOW}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{PAYMENT_METHOD_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-44" style="Report_Footer" x="593" y="0" width="179" height="18"/>
-					<textElement/>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{FINANCIAL_ACCOUNT_SHOW}.toString()]]></textFieldExpression>
+					<reportElement key="textField-44" style="Report_Footer" x="593" y="0" width="179" height="18" uuid="5743d783-f3c6-4961-b283-68c32c8ad842"/>
+					<textFieldExpression><![CDATA[$P{FINANCIAL_ACCOUNT_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-49" style="Report_Footer" x="11" y="20" width="179" height="18"/>
+					<reportElement key="staticText-49" style="Report_Footer" x="11" y="20" width="179" height="18" uuid="6172b95b-2ce8-4dc6-878b-527554d24d57"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Currency:]]></text>
 				</staticText>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-45" style="Report_Footer" x="196" y="20" width="179" height="18"/>
+					<reportElement key="textField-45" style="Report_Footer" x="196" y="20" width="179" height="18" uuid="028dd76b-b9e7-4b59-a8bc-4103df178877"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{CURRENCY_SHOW}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{CURRENCY_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
@@ -294,18 +288,18 @@
 		<groupHeader>
 			<band height="20" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText-43" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18"/>
+					<reportElement key="staticText-43" style="Report_Footer" stretchType="RelativeToBandHeight" x="11" y="0" width="179" height="18" uuid="0a1747bc-ec35-4226-ae00-589481812f8c"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Ordering Criteria:]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement key="textField-34" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18"/>
+					<reportElement key="textField-34" style="Report_Footer" stretchType="RelativeToBandHeight" x="196" y="0" width="179" height="18" uuid="08074fe1-7323-4ea1-93a8-df013734de39"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$P{ORDCRIT_SHOW}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{ORDCRIT_SHOW}.toString()]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
@@ -337,11 +331,11 @@
 			<band height="30" splitType="Stretch">
 				<printWhenExpression><![CDATA[!"".equals($P{GROUP_CRIT})]]></printWhenExpression>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-19" style="Detail_Header" x="103" y="0" width="246" height="20"/>
+					<reportElement key="textField-19" style="Detail_Header" x="103" y="0" width="246" height="20" uuid="e3eecb3e-0bc8-42b6-bade-3bdaf02770bc"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($P{GROUP_CRIT}.equalsIgnoreCase("APRM_FATS_BPARTNER") ? $F{BPARTNER}.toString() :
+					<textFieldExpression><![CDATA[($P{GROUP_CRIT}.equalsIgnoreCase("APRM_FATS_BPARTNER") ? $F{BPARTNER}.toString() :
   ($P{GROUP_CRIT}.equalsIgnoreCase("Project") ? $F{PROJECT}.toString() :
     ($P{GROUP_CRIT}.equalsIgnoreCase("FINPR_BPartner_Category") ? $F{BP_GROUP}.toString() :
       ($P{GROUP_CRIT}.equalsIgnoreCase("INS_CURRENCY") ? $F{TRANS_CURRENCY}.toString() :
@@ -353,32 +347,32 @@
 )]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-44" style="Detail_Header" x="1" y="0" width="103" height="20"/>
+					<reportElement key="staticText-44" style="Detail_Header" x="1" y="0" width="103" height="20" uuid="c8ae3b56-2517-41b7-a528-08f894fc2346"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Grouping Criteria:]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-44" style="Detail_Header" x="349" y="0" width="58" height="20"/>
+					<reportElement key="staticText-44" style="Detail_Header" x="349" y="0" width="58" height="20" uuid="461aae98-529d-4bd8-8385-6342953dfe3a"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans"/>
 					</textElement>
 					<text><![CDATA[Balance:]]></text>
 				</staticText>
 				<textField isBlankWhenNull="true">
-					<reportElement key="textField-19" style="Detail_Header" x="479" y="0" width="37" height="20"/>
+					<reportElement key="textField-19" style="Detail_Header" x="479" y="0" width="37" height="20" uuid="28260af8-a78c-49cc-ab0e-4b741f40e878"/>
 					<textElement textAlignment="Justified">
 						<font fontName="DejaVu Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
 				</textField>
 				<textField evaluationTime="Group" evaluationGroup="GroupingCriteria" isBlankWhenNull="true">
-					<reportElement key="textField-19" style="Detail_Header" x="407" y="0" width="72" height="20"/>
+					<reportElement key="textField-19" style="Detail_Header" x="407" y="0" width="72" height="20" uuid="14c1d732-a235-48a4-a8a9-175591e9036f"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($V{SUMBALANCE}!=null)?$P{NUMBERFORMAT}.format($V{SUMBALANCE}).toString():new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($V{SUMBALANCE}!=null)?$P{NUMBERFORMAT}.format($V{SUMBALANCE}).toString():new String(" ")]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
@@ -388,7 +382,7 @@
 		<groupHeader>
 			<band height="60" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText-2" style="Detail_Header" x="1" y="35" width="100" height="25"/>
+					<reportElement key="staticText-2" style="Detail_Header" x="1" y="35" width="100" height="25" uuid="6ded83c1-5034-4d33-931c-092801ef633d"/>
 					<box leftPadding="2"/>
 					<textElement verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -396,7 +390,7 @@
 					<text><![CDATA[Business Partner]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-4" style="Detail_Header" x="285" y="35" width="65" height="25"/>
+					<reportElement key="staticText-4" style="Detail_Header" x="285" y="35" width="65" height="25" uuid="d26a7aeb-43a1-433e-a686-959222707aa0"/>
 					<box leftPadding="2"/>
 					<textElement verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -404,7 +398,7 @@
 					<text><![CDATA[Payment]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-5" style="Detail_Header" x="102" y="35" width="70" height="25"/>
+					<reportElement key="staticText-5" style="Detail_Header" x="102" y="35" width="70" height="25" uuid="c5e07f95-fb36-426c-a383-de0060792657"/>
 					<box leftPadding="2"/>
 					<textElement verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -412,7 +406,7 @@
 					<text><![CDATA[Sales Person]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-6" style="Detail_Header" x="173" y="35" width="55" height="25"/>
+					<reportElement key="staticText-6" style="Detail_Header" x="173" y="35" width="55" height="25" uuid="0166abd3-0aeb-4dea-857e-1e96f86db279"/>
 					<box leftPadding="2"/>
 					<textElement verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -420,7 +414,7 @@
 					<text><![CDATA[Invoice Number]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-7" style="Detail_Header" x="229" y="35" width="55" height="25"/>
+					<reportElement key="staticText-7" style="Detail_Header" x="229" y="35" width="55" height="25" uuid="153e019b-b727-4499-b6f7-758a0ad35770"/>
 					<box leftPadding="2"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -428,7 +422,7 @@
 					<text><![CDATA[Invoice Date]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-8" style="Detail_Header" x="351" y="35" width="61" height="25"/>
+					<reportElement key="staticText-8" style="Detail_Header" x="351" y="35" width="61" height="25" uuid="38b58e5b-238d-49b4-82fc-119173a21091"/>
 					<box leftPadding="2"/>
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -436,28 +430,28 @@
 					<text><![CDATA[Expected Date]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-9" style="Detail_Header" x="412" y="35" width="33" height="25"/>
+					<reportElement key="staticText-9" style="Detail_Header" x="412" y="35" width="33" height="25" uuid="9435ab33-40a4-4369-a94a-75cf3267bdb8"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
 					</textElement>
 					<text><![CDATA[PlannedDSO]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-10" style="Detail_Header" x="446" y="35" width="33" height="25"/>
+					<reportElement key="staticText-10" style="Detail_Header" x="446" y="35" width="33" height="25" uuid="7d4a0f1e-1aa3-402e-9d09-fcd7a560ab18"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
 					</textElement>
 					<text><![CDATA[CurrentDSO]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-11" style="Detail_Header" x="480" y="35" width="36" height="25"/>
+					<reportElement key="staticText-11" style="Detail_Header" x="480" y="35" width="36" height="25" uuid="7959b859-3ba3-4060-92b1-3ca4aea9a8b0"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
 					</textElement>
 					<text><![CDATA[Overdue]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-13" style="Detail_Header" x="654" y="35" width="75" height="25"/>
+					<reportElement key="staticText-13" style="Detail_Header" x="654" y="35" width="75" height="25" uuid="b4e5ab52-1feb-4952-9af5-434c908c8ee9"/>
 					<box rightPadding="2"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -465,7 +459,7 @@
 					<text><![CDATA[Base Amount]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-14" style="Detail_Header" x="730" y="35" width="51" height="25"/>
+					<reportElement key="staticText-14" style="Detail_Header" x="730" y="35" width="51" height="25" uuid="db747417-a4d5-4b60-912b-13c5c75b4241"/>
 					<box leftPadding="2"/>
 					<textElement textAlignment="Center">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -473,7 +467,7 @@
 					<text><![CDATA[Base Currency]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-15" style="Detail_Header" x="517" y="35" width="75" height="25"/>
+					<reportElement key="staticText-15" style="Detail_Header" x="517" y="35" width="75" height="25" uuid="94678790-4aa7-4975-936c-59724cea4fc4"/>
 					<box rightPadding="2"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -481,7 +475,7 @@
 					<text><![CDATA[Transactional Amount]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-16" style="Detail_Header" x="593" y="35" width="60" height="25"/>
+					<reportElement key="staticText-16" style="Detail_Header" x="593" y="35" width="60" height="25" uuid="76bd692c-f062-49de-b4cd-4e31b1f4a713"/>
 					<box leftPadding="2"/>
 					<textElement textAlignment="Center">
 						<font fontName="DejaVu Sans" size="8" isBold="false"/>
@@ -489,59 +483,59 @@
 					<text><![CDATA[Transactional Currency]]></text>
 				</staticText>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-20" style="Detail_Header" x="42" y="0" width="140" height="20"/>
+					<reportElement key="textField-20" style="Detail_Header" x="42" y="0" width="140" height="20" uuid="5f3aab8d-a084-4394-9ecd-de3ab20c4b6a"/>
 					<textElement>
 						<font fontName="DejaVu Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{STATUS}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{STATUS}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement key="line-36" style="Report_Footer" x="0" y="35" width="782" height="1"/>
+					<reportElement key="line-36" style="Report_Footer" x="0" y="35" width="782" height="1" uuid="a57ca3b1-6d6c-4c61-a7eb-be283bbbccef"/>
 				</line>
 				<line>
-					<reportElement key="line-37" style="Report_Footer" stretchType="RelativeToBandHeight" x="0" y="35" width="1" height="25"/>
+					<reportElement key="line-37" style="Report_Footer" stretchType="RelativeToBandHeight" x="0" y="35" width="1" height="25" uuid="0617e110-f967-4059-a9da-aa22d33689c8"/>
 				</line>
 				<line>
-					<reportElement key="line-38" style="Report_Footer" stretchType="RelativeToBandHeight" x="101" y="35" width="1" height="25"/>
+					<reportElement key="line-38" style="Report_Footer" stretchType="RelativeToBandHeight" x="101" y="35" width="1" height="25" uuid="3cf51cd2-2dfc-4f5e-8c5e-d9766ef3fcac"/>
 				</line>
 				<line>
-					<reportElement key="line-39" style="Report_Footer" stretchType="RelativeToBandHeight" x="172" y="35" width="1" height="25"/>
+					<reportElement key="line-39" style="Report_Footer" stretchType="RelativeToBandHeight" x="172" y="35" width="1" height="25" uuid="6493541b-b5cc-4cb0-9c90-36e3dea808ba"/>
 				</line>
 				<line>
-					<reportElement key="line-40" style="Report_Footer" stretchType="RelativeToBandHeight" x="228" y="35" width="1" height="25"/>
+					<reportElement key="line-40" style="Report_Footer" stretchType="RelativeToBandHeight" x="228" y="35" width="1" height="25" uuid="300ede3c-5c25-43b6-be75-b5911390a1a9"/>
 				</line>
 				<line>
-					<reportElement key="line-41" style="Report_Footer" stretchType="RelativeToBandHeight" x="284" y="35" width="1" height="25"/>
+					<reportElement key="line-41" style="Report_Footer" stretchType="RelativeToBandHeight" x="284" y="35" width="1" height="25" uuid="487d171b-6290-4ca3-8b8d-140bb14762b6"/>
 				</line>
 				<line>
-					<reportElement key="line-42" style="Report_Footer" stretchType="RelativeToBandHeight" x="350" y="35" width="1" height="25"/>
+					<reportElement key="line-42" style="Report_Footer" stretchType="RelativeToBandHeight" x="350" y="35" width="1" height="25" uuid="99d486ee-3925-47c0-a646-c0cb6c4f817c"/>
 				</line>
 				<line>
-					<reportElement key="line-43" style="Report_Footer" stretchType="RelativeToBandHeight" x="412" y="35" width="1" height="25"/>
+					<reportElement key="line-43" style="Report_Footer" stretchType="RelativeToBandHeight" x="412" y="35" width="1" height="25" uuid="00e5626b-63a3-4ca5-b328-33268ff7ddcd"/>
 				</line>
 				<line>
-					<reportElement key="line-44" style="Report_Footer" stretchType="RelativeToBandHeight" x="445" y="35" width="1" height="25"/>
+					<reportElement key="line-44" style="Report_Footer" stretchType="RelativeToBandHeight" x="445" y="35" width="1" height="25" uuid="f7e5b742-21f6-42ec-be4b-2d6f92fbd396"/>
 				</line>
 				<line>
-					<reportElement key="line-45" style="Report_Footer" stretchType="RelativeToBandHeight" x="479" y="35" width="1" height="25"/>
+					<reportElement key="line-45" style="Report_Footer" stretchType="RelativeToBandHeight" x="479" y="35" width="1" height="25" uuid="0eaf78ab-cc35-49bf-bb50-19463785448c"/>
 				</line>
 				<line>
-					<reportElement key="line-46" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="35" width="1" height="25"/>
+					<reportElement key="line-46" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="35" width="1" height="25" uuid="fced94e7-c104-4403-b2c3-c394987465e9"/>
 				</line>
 				<line>
-					<reportElement key="line-47" style="Report_Footer" stretchType="RelativeToBandHeight" x="592" y="35" width="1" height="25"/>
+					<reportElement key="line-47" style="Report_Footer" stretchType="RelativeToBandHeight" x="592" y="35" width="1" height="25" uuid="9acdcfd9-698b-46da-8ab2-d0e64e02f895"/>
 				</line>
 				<line>
-					<reportElement key="line-48" style="Report_Footer" stretchType="RelativeToBandHeight" x="653" y="35" width="1" height="25"/>
+					<reportElement key="line-48" style="Report_Footer" stretchType="RelativeToBandHeight" x="653" y="35" width="1" height="25" uuid="ea0359a3-2df7-4587-9838-02781d918a66"/>
 				</line>
 				<line>
-					<reportElement key="line-49" style="Report_Footer" stretchType="RelativeToBandHeight" x="729" y="35" width="1" height="25"/>
+					<reportElement key="line-49" style="Report_Footer" stretchType="RelativeToBandHeight" x="729" y="35" width="1" height="25" uuid="928e123d-218c-47e1-bd61-ce9bbee504e7"/>
 				</line>
 				<line>
-					<reportElement key="line-50" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="35" width="1" height="25"/>
+					<reportElement key="line-50" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="35" width="1" height="25" uuid="a046f1e7-dd14-44e9-b930-d5bda17ab2d4"/>
 				</line>
 				<staticText>
-					<reportElement key="staticText-45" style="Detail_Header" x="1" y="0" width="41" height="20"/>
+					<reportElement key="staticText-45" style="Detail_Header" x="1" y="0" width="41" height="20" uuid="c07abcfb-614c-4056-a5de-a974480d3498"/>
 					<textElement>
 						<font fontName="DejaVu Sans"/>
 					</textElement>
@@ -552,34 +546,34 @@
 		<groupFooter>
 			<band height="30" splitType="Stretch">
 				<line>
-					<reportElement key="line-3" style="Report_Footer" x="0" y="0" width="782" height="1"/>
+					<reportElement key="line-3" style="Report_Footer" x="0" y="0" width="782" height="1" uuid="ba3714c0-a24c-40cd-a525-33b92884d189"/>
 				</line>
 				<staticText>
-					<reportElement key="staticText-21" style="Report_Footer" x="626" y="6" width="75" height="20"/>
+					<reportElement key="staticText-21" style="Report_Footer" x="626" y="6" width="75" height="20" uuid="e1f78d1f-48b2-41eb-9b5f-4277f3fe3168"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans" size="8"/>
 					</textElement>
 					<text><![CDATA[Sub Total (Status):]]></text>
 				</staticText>
 				<line>
-					<reportElement key="line-32" style="Report_Footer" x="626" y="27" width="156" height="1"/>
+					<reportElement key="line-32" style="Report_Footer" x="626" y="27" width="156" height="1" uuid="17a97770-b7ab-4a0c-9e2c-d82a4c63b8aa"/>
 				</line>
 				<line>
-					<reportElement key="line-33" style="Report_Footer" x="625" y="5" width="156" height="1"/>
+					<reportElement key="line-33" style="Report_Footer" x="625" y="5" width="156" height="1" uuid="44305937-d997-435b-8e1a-2866be374bc7"/>
 				</line>
 				<line>
-					<reportElement key="line-34" style="Report_Footer" x="625" y="5" width="1" height="23"/>
+					<reportElement key="line-34" style="Report_Footer" x="625" y="5" width="1" height="23" uuid="869fa018-6b6f-4297-bbcc-7b97376f5b11"/>
 				</line>
 				<line>
-					<reportElement key="line-35" style="Report_Footer" x="781" y="5" width="1" height="23"/>
+					<reportElement key="line-35" style="Report_Footer" x="781" y="5" width="1" height="23" uuid="8e73ff2b-3c8a-4dbb-a420-7d4eaeaa341d"/>
 				</line>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-22" style="Report_Footer" x="702" y="6" width="78" height="20"/>
+					<reportElement key="textField-22" style="Report_Footer" x="702" y="6" width="78" height="20" uuid="34d54991-a1bc-435e-9814-b9625d64991b"/>
 					<box rightPadding="2"/>
 					<textElement textAlignment="Right">
 						<font fontName="DejaVu Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($V{SUMSUBTOTALSTATUS}!=null)?$P{NUMBERFORMAT}.format($V{SUMSUBTOTALSTATUS}).toString():new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($V{SUMSUBTOTALSTATUS}!=null)?$P{NUMBERFORMAT}.format($V{SUMSUBTOTALSTATUS}).toString():new String(" ")]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupFooter>
@@ -590,155 +584,149 @@
 	<title>
 		<band height="196" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-24" style="Report_Footer" x="11" y="73" width="179" height="18"/>
+				<reportElement key="staticText-24" style="Report_Footer" x="11" y="73" width="179" height="18" uuid="53e48d34-9779-47a1-b1ca-5c5cdc88916e"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans"/>
 				</textElement>
 				<text><![CDATA[Organization:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-25" style="Report_Footer" x="408" y="73" width="179" height="18"/>
+				<reportElement key="staticText-25" style="Report_Footer" x="408" y="73" width="179" height="18" uuid="cf05ad4b-a424-46d8-8a79-7079425fdd35"/>
 				<textElement textAlignment="Right"/>
 				<text><![CDATA[Include Sub-Organization:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-26" style="Report_Footer" x="11" y="93" width="179" height="18"/>
+				<reportElement key="staticText-26" style="Report_Footer" x="11" y="93" width="179" height="18" uuid="58981e73-5c1b-424a-a4d2-1d9209c40c3f"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans"/>
 				</textElement>
 				<text><![CDATA[Due Date From:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-27" style="Report_Footer" x="408" y="93" width="179" height="18"/>
+				<reportElement key="staticText-27" style="Report_Footer" x="408" y="93" width="179" height="18" uuid="b2191ff4-88ce-487e-8b99-46388953e85c"/>
 				<textElement textAlignment="Right"/>
 				<text><![CDATA[Due Date To:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-28" style="Report_Footer" x="11" y="136" width="179" height="18"/>
+				<reportElement key="staticText-28" style="Report_Footer" x="11" y="136" width="179" height="18" uuid="37683859-a826-4506-b357-a4c2e7ba4a5f"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans"/>
 				</textElement>
 				<text><![CDATA[Amount From:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-29" style="Report_Footer" x="408" y="136" width="179" height="18"/>
+				<reportElement key="staticText-29" style="Report_Footer" x="408" y="136" width="179" height="18" uuid="1e080a31-5b52-4383-850e-6c8d26b0dd9f"/>
 				<textElement textAlignment="Right"/>
 				<text><![CDATA[Amount To:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-30" style="Report_Footer" x="11" y="157" width="179" height="18"/>
+				<reportElement key="staticText-30" style="Report_Footer" x="11" y="157" width="179" height="18" uuid="45a2aad2-b681-43f7-8ebd-21b4f53af22e"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans"/>
 				</textElement>
 				<text><![CDATA[Document Date From:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-31" style="Report_Footer" x="408" y="157" width="179" height="18"/>
+				<reportElement key="staticText-31" style="Report_Footer" x="408" y="157" width="179" height="18" uuid="53ff434e-d8c3-4f94-abcc-d1b78ba9552f"/>
 				<textElement textAlignment="Right"/>
 				<text><![CDATA[Document Date To:]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-25" style="Report_Footer" x="196" y="73" width="179" height="18"/>
+				<reportElement key="textField-25" style="Report_Footer" x="196" y="73" width="179" height="18" uuid="78f24f85-f346-4449-946b-d6253f56efa5"/>
 				<textElement>
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{ORG_SHOW}.toString()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{ORG_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-26" style="Report_Footer" x="196" y="93" width="179" height="18"/>
+				<reportElement key="textField-26" style="Report_Footer" x="196" y="93" width="179" height="18" uuid="75e8bcf0-6df7-4ab3-bf22-c2f507834fd7"/>
 				<textElement>
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DUEDATEFROM_SHOW}.toString()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DUEDATEFROM_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-27" style="Report_Footer" x="196" y="136" width="179" height="18"/>
+				<reportElement key="textField-27" style="Report_Footer" x="196" y="136" width="179" height="18" uuid="869bb876-3330-4478-beec-8363787a2e1a"/>
 				<textElement>
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{AMTFROM_SHOW}.toString()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{AMTFROM_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-28" style="Report_Footer" x="196" y="157" width="179" height="18"/>
+				<reportElement key="textField-28" style="Report_Footer" x="196" y="157" width="179" height="18" uuid="c7c4ea93-c233-467b-a7ee-3d9b96c53509"/>
 				<textElement>
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DOCDATEFROM_SHOW}.toString()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DOCDATEFROM_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-36" style="Report_Footer" x="593" y="73" width="179" height="18"/>
-				<textElement/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{INCL_SUBORG_SHOW}.toString()]]></textFieldExpression>
+				<reportElement key="textField-36" style="Report_Footer" x="593" y="73" width="179" height="18" uuid="365b7502-511a-4e8c-9a3c-4c8a514e17ce"/>
+				<textFieldExpression><![CDATA[$P{INCL_SUBORG_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-37" style="Report_Footer" x="593" y="93" width="179" height="18"/>
-				<textElement/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DUEDATETO_SHOW}.toString()]]></textFieldExpression>
+				<reportElement key="textField-37" style="Report_Footer" x="593" y="93" width="179" height="18" uuid="d994a4db-d47a-4b95-8fe1-0a88db872f50"/>
+				<textFieldExpression><![CDATA[$P{DUEDATETO_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-38" style="Report_Footer" x="593" y="136" width="179" height="18"/>
-				<textElement/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{AMTTO_SHOW}.toString()]]></textFieldExpression>
+				<reportElement key="textField-38" style="Report_Footer" x="593" y="136" width="179" height="18" uuid="4ab7e77d-83d6-4e21-a9ce-a201b148c49e"/>
+				<textFieldExpression><![CDATA[$P{AMTTO_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-39" style="Report_Footer" x="593" y="157" width="179" height="18"/>
-				<textElement/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DOCDATETO_SHOW}.toString()]]></textFieldExpression>
+				<reportElement key="textField-39" style="Report_Footer" x="593" y="157" width="179" height="18" uuid="295e43ae-d4ef-474b-a48f-efe781368842"/>
+				<textFieldExpression><![CDATA[$P{DOCDATETO_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-46" style="Report_Footer" x="11" y="5" width="634" height="48"/>
+				<reportElement key="staticText-46" style="Report_Footer" x="11" y="5" width="634" height="48" uuid="3d2f8751-e4b1-4556-8fc0-464bf11357c9"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="36"/>
 				</textElement>
 				<text><![CDATA[PAYMENT REPORT]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-28" style="Report_Footer" x="196" y="177" width="179" height="18"/>
+				<reportElement key="textField-28" style="Report_Footer" x="196" y="177" width="179" height="18" uuid="44554817-2938-4a40-b50f-49ffb3ed833f"/>
 				<textElement>
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{PAYDATEFROM_SHOW}.toString()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{PAYDATEFROM_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-39" style="Report_Footer" x="593" y="177" width="179" height="18"/>
-				<textElement/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{PAYDATETO_SHOW}.toString()]]></textFieldExpression>
+				<reportElement key="textField-39" style="Report_Footer" x="593" y="177" width="179" height="18" uuid="5dd61650-cc17-426f-a9b4-ec98d3d99d1b"/>
+				<textFieldExpression><![CDATA[$P{PAYDATETO_SHOW}.toString()]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-31" style="Report_Footer" x="408" y="177" width="179" height="18"/>
+				<reportElement key="staticText-31" style="Report_Footer" x="408" y="177" width="179" height="18" uuid="9cfe310e-664e-431c-ac92-8295364d53d9"/>
 				<textElement textAlignment="Right"/>
 				<text><![CDATA[Payment Date To:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-30" style="Report_Footer" x="11" y="177" width="179" height="18"/>
+				<reportElement key="staticText-30" style="Report_Footer" x="11" y="177" width="179" height="18" uuid="0c1406b7-d6d2-4e88-b575-ae58762d1919"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans"/>
 				</textElement>
 				<text><![CDATA[Payment Date From:]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-26" style="Report_Footer" x="196" y="114" width="179" height="18"/>
+				<reportElement key="textField-26" style="Report_Footer" x="196" y="114" width="179" height="18" uuid="e66d68fb-7dec-4066-80d7-ff902cb6f158"/>
 				<textElement>
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{EXPECTEDDATEFROM_SHOW}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{EXPECTEDDATEFROM_SHOW}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-27" style="Report_Footer" x="408" y="114" width="179" height="18"/>
+				<reportElement key="staticText-27" style="Report_Footer" x="408" y="114" width="179" height="18" uuid="099b539e-f8e7-4991-b9c3-3db1e40535d0"/>
 				<textElement textAlignment="Right"/>
 				<text><![CDATA[Expected Date To:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-26" style="Report_Footer" x="11" y="114" width="179" height="18"/>
+				<reportElement key="staticText-26" style="Report_Footer" x="11" y="114" width="179" height="18" uuid="ada052b1-8424-4e7e-a689-4365d184cc07"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans"/>
 				</textElement>
 				<text><![CDATA[Expected Date From:]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-37" style="Report_Footer" x="593" y="114" width="179" height="18"/>
-				<textElement/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{EXPECTEDDATETO_SHOW}]]></textFieldExpression>
+				<reportElement key="textField-37" style="Report_Footer" x="593" y="114" width="179" height="18" uuid="63a11c75-3a47-41a9-b597-e05818eaee55"/>
+				<textFieldExpression><![CDATA[$P{EXPECTEDDATETO_SHOW}]]></textFieldExpression>
 			</textField>
 		</band>
 	</title>
@@ -751,148 +739,148 @@
 	<detail>
 		<band height="25" splitType="Stretch">
 			<frame>
-				<reportElement key="frame-1" style="Detail_Line" x="0" y="0" width="782" height="25"/>
+				<reportElement key="frame-1" style="Detail_Line" x="0" y="0" width="782" height="25" uuid="515e87db-984c-4145-ae86-8bc24b84bdab"/>
 			</frame>
 			<line>
-				<reportElement key="line-1" style="Report_Footer" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="25"/>
+				<reportElement key="line-1" style="Report_Footer" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="25" uuid="32dc1ead-6253-407e-b2ae-7dc0971b9aa1"/>
 			</line>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-2" style="Report_Footer" x="2" y="0" width="98" height="25"/>
+				<reportElement key="textField-2" style="Report_Footer" x="2" y="0" width="98" height="25" uuid="6cee4dc1-1edf-463a-a631-08dbd935089b"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{BPARTNER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BPARTNER}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-4" style="Report_Footer" x="285" y="0" width="64" height="25"/>
+				<reportElement key="textField-4" style="Report_Footer" x="285" y="0" width="64" height="25" uuid="2ab054f6-a64e-4d4b-b0a7-bc580e10dc18"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{PAYMENT}==null ? " " : $F{PAYMENT})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{PAYMENT}==null ? " " : $F{PAYMENT})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-5" style="Report_Footer" x="102" y="0" width="69" height="25"/>
+				<reportElement key="textField-5" style="Report_Footer" x="102" y="0" width="69" height="25" uuid="00a5f0e4-442b-4e21-8f17-430b289d5c99"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{SALES_PERSON}==null ? " " : $F{SALES_PERSON})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{SALES_PERSON}==null ? " " : $F{SALES_PERSON})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-6" style="Report_Footer" x="173" y="0" width="55" height="25"/>
+				<reportElement key="textField-6" style="Report_Footer" x="173" y="0" width="55" height="25" uuid="a36b61b3-0742-4b2e-8ecd-5b2842f390f1"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_NUMBER}==null ? " " : $F{INVOICE_NUMBER}.toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{INVOICE_NUMBER}==null ? " " : $F{INVOICE_NUMBER}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-7" style="Report_Footer" x="229" y="0" width="54" height="25"/>
+				<reportElement key="textField-7" style="Report_Footer" x="229" y="0" width="54" height="25" uuid="62b42099-1dfd-4cca-b9a5-7ecf0fda327f"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_DATE}== null ? " " : $F{INVOICE_DATE})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{INVOICE_DATE}== null ? " " : $F{INVOICE_DATE})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-8" style="Report_Footer" x="350" y="0" width="62" height="25"/>
+				<reportElement key="textField-8" style="Report_Footer" x="350" y="0" width="62" height="25" uuid="c73189e0-f12a-4852-8b9f-7d58a44497c6"/>
 				<box leftPadding="2"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{EXPECTED_DATE}== null ? " " : $F{EXPECTED_DATE})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{EXPECTED_DATE}== null ? " " : $F{EXPECTED_DATE})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-9" style="Report_Footer" x="412" y="0" width="33" height="25"/>
+				<reportElement key="textField-9" style="Report_Footer" x="412" y="0" width="33" height="25" uuid="fc9250c8-954f-428c-8f6b-abda6b409d11"/>
 				<textElement textAlignment="Center">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{PLANNED_DSO}== null ? " " : $F{PLANNED_DSO}.toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{PLANNED_DSO}== null ? " " : $F{PLANNED_DSO}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-10" style="Report_Footer" x="446" y="0" width="33" height="25"/>
+				<reportElement key="textField-10" style="Report_Footer" x="446" y="0" width="33" height="25" uuid="b3d660d0-b2db-4680-b6d6-ce34183eb1a5"/>
 				<textElement textAlignment="Center">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{CURRENT_DSO}== null ? " " : $F{CURRENT_DSO}.toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{CURRENT_DSO}== null ? " " : $F{CURRENT_DSO}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-11" style="Report_Footer" x="480" y="0" width="36" height="25"/>
+				<reportElement key="textField-11" style="Report_Footer" x="480" y="0" width="36" height="25" uuid="3af350b3-7a97-4835-b03f-03e2a671b54b"/>
 				<textElement textAlignment="Center">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-13" style="Report_Footer" x="654" y="0" width="74" height="25"/>
+				<reportElement key="textField-13" style="Report_Footer" x="654" y="0" width="74" height="25" uuid="c7897cb8-44f9-4b17-882d-d72f20913658"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{BASE_AMOUNT}== null ? " " : $P{NUMBERFORMAT}.format($F{BASE_AMOUNT}).toString())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{BASE_AMOUNT}== null ? " " : $P{NUMBERFORMAT}.format($F{BASE_AMOUNT}).toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-14" style="Report_Footer" x="730" y="0" width="50" height="25"/>
+				<reportElement key="textField-14" style="Report_Footer" x="730" y="0" width="50" height="25" uuid="8ead23fc-5822-400a-a0d4-f3195995b556"/>
 				<textElement textAlignment="Center">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-15" style="Report_Footer" x="517" y="0" width="74" height="25"/>
+				<reportElement key="textField-15" style="Report_Footer" x="517" y="0" width="74" height="25" uuid="d63322e2-7be2-4ee5-9549-df6e0220cb88"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{NUMBERFORMAT}.format($F{TRANS_AMOUNT}).toString() + " "]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{NUMBERFORMAT}.format($F{TRANS_AMOUNT}).toString() + " "]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-16" style="Report_Footer" x="593" y="0" width="60" height="25"/>
+				<reportElement key="textField-16" style="Report_Footer" x="593" y="0" width="60" height="25" uuid="2d3d9724-a086-4616-a115-c81b3c23d427"/>
 				<textElement textAlignment="Center">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_CURRENCY}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{TRANS_CURRENCY}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-5" style="Report_Footer" stretchType="RelativeToBandHeight" x="101" y="0" width="1" height="25"/>
+				<reportElement key="line-5" style="Report_Footer" stretchType="RelativeToBandHeight" x="101" y="0" width="1" height="25" uuid="2f7ac113-7f29-4fc2-b064-185ccf45b337"/>
 			</line>
 			<line>
-				<reportElement key="line-7" style="Report_Footer" stretchType="RelativeToBandHeight" x="172" y="0" width="1" height="25"/>
+				<reportElement key="line-7" style="Report_Footer" stretchType="RelativeToBandHeight" x="172" y="0" width="1" height="25" uuid="38a8f536-fa29-4272-aa12-b19c285d9023"/>
 			</line>
 			<line>
-				<reportElement key="line-8" style="Report_Footer" stretchType="RelativeToBandHeight" x="284" y="0" width="1" height="25"/>
+				<reportElement key="line-8" style="Report_Footer" stretchType="RelativeToBandHeight" x="284" y="0" width="1" height="25" uuid="a6d4ef1b-4f42-41b3-87f8-0eaf9226f6ed"/>
 			</line>
 			<line>
-				<reportElement key="line-9" style="Report_Footer" stretchType="RelativeToBandHeight" x="228" y="0" width="1" height="25"/>
+				<reportElement key="line-9" style="Report_Footer" stretchType="RelativeToBandHeight" x="228" y="0" width="1" height="25" uuid="a4ecb202-e815-47a4-bd67-dc2b168db0fe"/>
 			</line>
 			<line>
-				<reportElement key="line-10" style="Report_Footer" stretchType="RelativeToBandHeight" x="350" y="0" width="1" height="25"/>
+				<reportElement key="line-10" style="Report_Footer" stretchType="RelativeToBandHeight" x="350" y="0" width="1" height="25" uuid="4a1b3a35-d44a-480e-bf67-7d94694adfed"/>
 			</line>
 			<line>
-				<reportElement key="line-11" style="Report_Footer" stretchType="RelativeToBandHeight" x="445" y="0" width="1" height="25"/>
+				<reportElement key="line-11" style="Report_Footer" stretchType="RelativeToBandHeight" x="445" y="0" width="1" height="25" uuid="b0b3b117-16d7-4a67-ba16-068912ab8487"/>
 			</line>
 			<line>
-				<reportElement key="line-12" style="Report_Footer" stretchType="RelativeToBandHeight" x="479" y="0" width="1" height="25"/>
+				<reportElement key="line-12" style="Report_Footer" stretchType="RelativeToBandHeight" x="479" y="0" width="1" height="25" uuid="500d239e-fc2a-4e14-89e2-dce686e7aa91"/>
 			</line>
 			<line>
-				<reportElement key="line-13" style="Report_Footer" stretchType="RelativeToBandHeight" x="412" y="0" width="1" height="25"/>
+				<reportElement key="line-13" style="Report_Footer" stretchType="RelativeToBandHeight" x="412" y="0" width="1" height="25" uuid="f189e17e-54e8-4bc4-a8eb-4723b622c6a3"/>
 			</line>
 			<line>
-				<reportElement key="line-15" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="0" width="1" height="25"/>
+				<reportElement key="line-15" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="0" width="1" height="25" uuid="fb94af81-42d3-4c25-a520-b4721b1378d0"/>
 			</line>
 			<line>
-				<reportElement key="line-17" style="Report_Footer" stretchType="RelativeToBandHeight" x="592" y="0" width="1" height="25"/>
+				<reportElement key="line-17" style="Report_Footer" stretchType="RelativeToBandHeight" x="592" y="0" width="1" height="25" uuid="9534ff26-3a5b-4521-b034-13c4b00331b8"/>
 			</line>
 			<line>
-				<reportElement key="line-18" style="Report_Footer" stretchType="RelativeToBandHeight" x="653" y="0" width="1" height="25"/>
+				<reportElement key="line-18" style="Report_Footer" stretchType="RelativeToBandHeight" x="653" y="0" width="1" height="25" uuid="f2f10c62-ea53-499c-864b-fcbe63f0992b"/>
 			</line>
 			<line>
-				<reportElement key="line-19" style="Report_Footer" stretchType="RelativeToBandHeight" x="729" y="0" width="1" height="25"/>
+				<reportElement key="line-19" style="Report_Footer" stretchType="RelativeToBandHeight" x="729" y="0" width="1" height="25" uuid="3b36db6e-f9df-4cf5-91f2-8f746191d3ea"/>
 			</line>
 			<line>
-				<reportElement key="line-25" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="25"/>
+				<reportElement key="line-25" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="25" uuid="2a846697-6273-4eb2-8e9c-419b04aa185f"/>
 			</line>
 		</band>
 	</detail>
@@ -905,7 +893,7 @@
 	<lastPageFooter>
 		<band height="40" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-51" style="Report_Footer" x="3" y="4" width="693" height="17">
+				<reportElement key="staticText-51" style="Report_Footer" x="3" y="4" width="693" height="17" uuid="2696a9a1-5ba9-4d76-a5d5-c6174af21f92">
 					<printWhenExpression><![CDATA[$P{ONE_ASTERISK_SHOW}]]></printWhenExpression>
 				</reportElement>
 				<textElement>
@@ -914,7 +902,7 @@
 				<text><![CDATA[* Invoice paid using a credit payment]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-52" style="Report_Footer" x="3" y="21" width="693" height="17">
+				<reportElement key="staticText-52" style="Report_Footer" x="3" y="21" width="693" height="17" uuid="9be86aac-2e8a-4a6c-bdcc-c272d4c55cef">
 					<printWhenExpression><![CDATA[$P{TWO_ASTERISK_SHOW}]]></printWhenExpression>
 				</reportElement>
 				<textElement>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportOrderNotShipped" pageWidth="842" pageHeight="595" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportOrderNotShipped" pageWidth="842" pageHeight="595" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="b2108c38-f573-4cc5-8aee-4725a42348b0">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="1.0"/>
@@ -103,7 +103,7 @@
 		<groupHeader>
 			<band height="20" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="0" y="0" width="84" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="0" y="0" width="84" height="20" forecolor="#FFFFFF" uuid="ff9c4312-dbd5-45e1-b49d-98d3031c66be"/>
 					<box leftPadding="5">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -117,7 +117,7 @@
 					<text><![CDATA[Organization]]></text>
 				</staticText>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField" style="GroupHeader_DarkGray" x="84" y="0" width="698" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="textField" style="GroupHeader_DarkGray" x="84" y="0" width="698" height="20" forecolor="#FFFFFF" uuid="88112009-21a5-4081-b90d-1455e3a6e108"/>
 					<box leftPadding="5">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -128,20 +128,20 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="10" isBold="true"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{orgname}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{orgname}]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="10" splitType="Stretch">
 				<line>
-					<reportElement key="line-6" x="0" y="9" width="782" height="1" forecolor="#555555"/>
+					<reportElement key="line-6" x="0" y="9" width="782" height="1" forecolor="#555555" uuid="29106dfd-c1be-45d1-ac29-f830c90b2186"/>
 				</line>
 				<line>
-					<reportElement key="line-17" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-17" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555" uuid="087d9158-0fe9-4a01-a7c9-e4b1d1037584"/>
 				</line>
 				<line>
-					<reportElement key="line-20" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-20" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555" uuid="132768a2-74db-47e3-a3a5-9190963e0234"/>
 				</line>
 			</band>
 		</groupFooter>
@@ -151,7 +151,7 @@
 		<groupHeader>
 			<band height="40" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="20" y="10" width="105" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="20" y="10" width="105" height="20" forecolor="#FFFFFF" uuid="aa1795bd-4be1-45ea-a9fe-6355a5e8cabe"/>
 					<box leftPadding="5">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -165,7 +165,7 @@
 					<text><![CDATA[Business Partner]]></text>
 				</staticText>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField" style="GroupHeader_DarkGray" x="125" y="10" width="657" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="textField" style="GroupHeader_DarkGray" x="125" y="10" width="657" height="20" forecolor="#FFFFFF" uuid="6bf746dc-8310-45a7-a2c1-15ab0b46923c"/>
 					<box leftPadding="5">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -176,35 +176,35 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="10" isBold="true"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{bpname}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{bpname}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement key="line-3" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="40" forecolor="#555555"/>
+					<reportElement key="line-3" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="40" forecolor="#555555" uuid="566e10e7-b80e-492a-a9c7-f4d7e1918810"/>
 				</line>
 				<line>
-					<reportElement key="line-11" stretchType="RelativeToBandHeight" x="20" y="30" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-11" stretchType="RelativeToBandHeight" x="20" y="30" width="1" height="10" forecolor="#555555" uuid="0e41dc1d-c22f-4249-818c-4dfcd913c5c3"/>
 				</line>
 				<line>
-					<reportElement key="line-14" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-14" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555" uuid="f6eeb31c-7ad3-456a-a15a-631e12abce78"/>
 				</line>
 				<line>
-					<reportElement key="line-28" stretchType="RelativeToBandHeight" x="781" y="30" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-28" stretchType="RelativeToBandHeight" x="781" y="30" width="1" height="10" forecolor="#555555" uuid="c9578b97-27f1-45b1-bd2e-ec3c8885a5e1"/>
 				</line>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="10" splitType="Stretch">
 				<line>
-					<reportElement key="line-16" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-16" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555" uuid="75ce28ca-8bca-44a6-9fe1-fe5f0bd500cf"/>
 				</line>
 				<line>
-					<reportElement key="line-19" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-19" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555" uuid="40b3b316-9823-4dea-9e8d-9154dd8d9020"/>
 				</line>
 				<line>
-					<reportElement key="line-21" x="20" y="9" width="762" height="1" forecolor="#555555"/>
+					<reportElement key="line-21" x="20" y="9" width="762" height="1" forecolor="#555555" uuid="1d92dfc8-554f-44c4-adad-2ed3d6e7a549"/>
 				</line>
 				<line>
-					<reportElement key="line-23" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-23" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="10" forecolor="#555555" uuid="b36ef598-0de5-4fa6-843b-08a61d37aeab"/>
 				</line>
 			</band>
 		</groupFooter>
@@ -214,7 +214,7 @@
 		<groupHeader>
 			<band height="60" splitType="Stretch">
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="39" y="0" width="159" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="39" y="0" width="159" height="20" forecolor="#FFFFFF" uuid="f6c1bbcd-938d-4d6f-876b-31c117009da7"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -228,7 +228,7 @@
 					<text><![CDATA[Order Document No.]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="false">
-					<reportElement key="textField" stretchType="RelativeToTallestObject" x="41" y="20" width="157" height="20" forecolor="#000000"/>
+					<reportElement key="textField" stretchType="RelativeToTallestObject" x="41" y="20" width="157" height="20" forecolor="#000000" uuid="e584b56a-ca5a-4b0f-80c3-421c26bdffe4"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -238,10 +238,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{documentno}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{documentno}]]></textFieldExpression>
 				</textField>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField" x="198" y="20" width="85" height="20" forecolor="#000000"/>
+					<reportElement key="textField" x="198" y="20" width="85" height="20" forecolor="#000000" uuid="3d3efba5-1114-4286-b684-f2c4f7f4bf34"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -251,10 +251,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.util.Date"><![CDATA[$F{dateordered}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{dateordered}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="198" y="0" width="85" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="198" y="0" width="85" height="20" forecolor="#FFFFFF" uuid="b10ea17f-6508-4d2c-b1b8-c961f35396cb"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -268,7 +268,7 @@
 					<text><![CDATA[Order Date]]></text>
 				</staticText>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField" x="283" y="20" width="93" height="20" forecolor="#000000"/>
+					<reportElement key="textField" x="283" y="20" width="93" height="20" forecolor="#000000" uuid="c6a14049-14af-40f2-b8f0-e8f4a2f83212"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -278,10 +278,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.util.Date"><![CDATA[$F{datepromised}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{datepromised}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="283" y="0" width="94" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="283" y="0" width="94" height="20" forecolor="#FFFFFF" uuid="ab307fb2-5493-45ea-8f69-43e4e206f048"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -295,7 +295,7 @@
 					<text><![CDATA[Delivery Date]]></text>
 				</staticText>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField" x="376" y="20" width="120" height="20" forecolor="#000000"/>
+					<reportElement key="textField" x="376" y="20" width="120" height="20" forecolor="#000000" uuid="7b78125c-9698-496b-8f86-5df0181ad1bc"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -305,10 +305,10 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[($F{deliveryrule}!=null)?$F{deliveryrule}:new String(" ")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($F{deliveryrule}!=null)?$F{deliveryrule}:new String(" ")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="377" y="0" width="119" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="377" y="0" width="119" height="20" forecolor="#FFFFFF" uuid="b4cd6046-ab6e-4295-bae6-58f2a2636c50"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -322,7 +322,7 @@
 					<text><![CDATA[Delivery Terms]]></text>
 				</staticText>
 				<textField pattern="" isBlankWhenNull="false">
-					<reportElement key="textField" x="496" y="20" width="283" height="20" forecolor="#000000"/>
+					<reportElement key="textField" x="496" y="20" width="283" height="20" forecolor="#000000" uuid="a6584a5c-3923-4c4d-ab31-0cd2d76c0852"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -332,10 +332,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{deliverylocation}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{deliverylocation}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="496" y="0" width="286" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="496" y="0" width="286" height="20" forecolor="#FFFFFF" uuid="1441fe35-a6e2-41e8-8a70-c8b374391b18"/>
 					<box leftPadding="5">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -349,7 +349,7 @@
 					<text><![CDATA[Delivery Location]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="62" y="40" width="214" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="62" y="40" width="214" height="20" forecolor="#FFFFFF" uuid="8a4b8527-7a8b-4c0b-82a1-7a2a8db30030"/>
 					<box leftPadding="5">
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -363,7 +363,7 @@
 					<text><![CDATA[Product]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="276" y="40" width="161" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="276" y="40" width="161" height="20" forecolor="#FFFFFF" uuid="12e657ab-c95c-4bb0-a3f0-4ea66c6a5f87"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -377,7 +377,7 @@
 					<text><![CDATA[Ordered Quantity]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="437" y="40" width="151" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="437" y="40" width="151" height="20" forecolor="#FFFFFF" uuid="7333cea3-abaf-4a3e-bc5c-c373cf253d70"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -391,7 +391,7 @@
 					<text><![CDATA[Pending Quantity]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText" style="GroupHeader_DarkGray" x="588" y="40" width="194" height="20" forecolor="#FFFFFF"/>
+					<reportElement key="staticText" style="GroupHeader_DarkGray" x="588" y="40" width="194" height="20" forecolor="#FFFFFF" uuid="5e1d0a2b-7ec5-4229-87ac-66f99550f6c6"/>
 					<box>
 						<pen lineWidth="0.0"/>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -405,38 +405,38 @@
 					<text><![CDATA[Quantity in Stock]]></text>
 				</staticText>
 				<line>
-					<reportElement key="line-4" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="60" forecolor="#555555"/>
+					<reportElement key="line-4" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="60" forecolor="#555555" uuid="8c1f0ecd-c59a-4a88-8b48-36908eb9b0fe"/>
 				</line>
 				<line>
-					<reportElement key="line-7" stretchType="RelativeToBandHeight" x="39" y="20" width="1" height="40" forecolor="#555555"/>
+					<reportElement key="line-7" stretchType="RelativeToBandHeight" x="39" y="20" width="1" height="40" forecolor="#555555" uuid="ed4ff1d6-6dbb-470a-b535-8f40330dc250"/>
 				</line>
 				<line>
-					<reportElement key="line-10" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="60" forecolor="#555555"/>
+					<reportElement key="line-10" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="60" forecolor="#555555" uuid="f4929536-4c7b-4304-933c-837a9ee5e459"/>
 				</line>
 				<line>
-					<reportElement key="line-13" stretchType="RelativeToBandHeight" x="781" y="20" width="1" height="20" forecolor="#555555"/>
+					<reportElement key="line-13" stretchType="RelativeToBandHeight" x="781" y="20" width="1" height="20" forecolor="#555555" uuid="b96c6afe-79e1-44e5-826a-292c2dcfb286"/>
 				</line>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="10" splitType="Stretch">
 				<line>
-					<reportElement key="line-15" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-15" stretchType="RelativeToBandHeight" x="0" y="0" width="1" height="10" forecolor="#555555" uuid="47ea2eca-d4d8-4a25-8672-f3f1e00cc8e7"/>
 				</line>
 				<line>
-					<reportElement key="line-18" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-18" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="10" forecolor="#555555" uuid="9576eee7-3b52-4d95-b932-56a8b1ee7d31"/>
 				</line>
 				<line>
-					<reportElement key="line-22" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-22" stretchType="RelativeToBandHeight" x="20" y="0" width="1" height="10" forecolor="#555555" uuid="c8c361a7-294a-41ed-a314-98befa8b2184"/>
 				</line>
 				<line>
-					<reportElement key="line-24" stretchType="RelativeToBandHeight" x="39" y="0" width="1" height="10" forecolor="#555555"/>
+					<reportElement key="line-24" stretchType="RelativeToBandHeight" x="39" y="0" width="1" height="10" forecolor="#555555" uuid="d8b0e0fb-f55d-4449-bcb5-f76902bb3ff2"/>
 				</line>
 				<line>
-					<reportElement key="line-25" x="39" y="9" width="742" height="1" forecolor="#555555"/>
+					<reportElement key="line-25" x="39" y="9" width="742" height="1" forecolor="#555555" uuid="73752f52-4456-400a-ab96-8892dec30ce3"/>
 				</line>
 				<line>
-					<reportElement key="line-27" x="60" y="0" width="722" height="1" forecolor="#555555"/>
+					<reportElement key="line-27" x="60" y="0" width="722" height="1" forecolor="#555555" uuid="e9d4f804-36a6-47a9-998a-572e739381aa"/>
 				</line>
 			</band>
 		</groupFooter>
@@ -447,7 +447,7 @@
 	<title>
 		<band height="56" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement key="textField-2" style="Report_Title" x="0" y="0" width="782" height="26"/>
+				<reportElement key="textField-2" style="Report_Title" x="0" y="0" width="782" height="26" uuid="52d052d2-36b0-4452-b9d4-ed9e955684e5"/>
 				<box leftPadding="5">
 					<pen lineWidth="0.0"/>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -456,13 +456,13 @@
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				<textElement textAlignment="Left"/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{REPORT_TITLE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{REPORT_TITLE}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-2" x="0" y="26" width="782" height="1"/>
+				<reportElement key="line-2" x="0" y="26" width="782" height="1" uuid="4f861921-dbce-471e-9061-ac56d250c754"/>
 			</line>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-3" style="Report_Subtitle" x="0" y="31" width="782" height="18"/>
+				<reportElement key="textField-3" style="Report_Subtitle" x="0" y="31" width="782" height="18" uuid="667f87bb-1c97-4ab7-8a75-db520331ac4d"/>
 				<box leftPadding="5">
 					<pen lineWidth="0.0"/>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -471,10 +471,10 @@
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				<textElement textAlignment="Left"/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{REPORT_SUBTITLE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{REPORT_SUBTITLE}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-1" x="0" y="49" width="782" height="1"/>
+				<reportElement key="line-1" x="0" y="49" width="782" height="1" uuid="7087cabe-fccc-41ff-b8f9-96570627f1cd"/>
 			</line>
 		</band>
 	</title>
@@ -487,7 +487,7 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="62" y="0" width="214" height="20" forecolor="#000000"/>
+				<reportElement key="textField" style="Detail_Task" x="62" y="0" width="214" height="20" forecolor="#000000" uuid="1704bcd6-5519-4584-a72e-559a0c5bda4d"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -497,10 +497,10 @@
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font fontName="Bitstream Vera Sans" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{prodname}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{prodname}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="276" y="0" width="161" height="20" forecolor="#000000"/>
+				<reportElement key="textField" style="Detail_Task" x="276" y="0" width="161" height="20" forecolor="#000000" uuid="d5dfd9df-9bef-4534-b7dc-ef4524bf09a1"/>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -510,10 +510,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Bitstream Vera Sans" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{orderedqty}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{orderedqty}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="437" y="0" width="151" height="20" forecolor="#000000"/>
+				<reportElement key="textField" style="Detail_Task" x="437" y="0" width="151" height="20" forecolor="#000000" uuid="9fe4f1f8-849b-446f-8aad-a702f97532a4"/>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -523,10 +523,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Bitstream Vera Sans" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{pendingqty}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{pendingqty}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Task" x="588" y="0" width="192" height="20" forecolor="#000000"/>
+				<reportElement key="textField" style="Detail_Task" x="588" y="0" width="192" height="20" forecolor="#000000" uuid="bc400d8e-f7c9-4a15-a321-b9b3f7a80feb"/>
 				<box rightPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -536,22 +536,22 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Bitstream Vera Sans" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{qtyinstock}!=null)?$F{qtyinstock}:new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{qtyinstock}!=null)?$F{qtyinstock}:new String(" ")]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-5" stretchType="RelativeToBandHeight" x="0" y="-2" width="1" height="22" forecolor="#555555"/>
+				<reportElement key="line-5" stretchType="RelativeToBandHeight" x="0" y="-2" width="1" height="22" forecolor="#555555" uuid="797cfc33-4975-4047-af18-c34c3a551856"/>
 			</line>
 			<line>
-				<reportElement key="line-8" stretchType="RelativeToBandHeight" x="39" y="0" width="1" height="20" forecolor="#555555"/>
+				<reportElement key="line-8" stretchType="RelativeToBandHeight" x="39" y="0" width="1" height="20" forecolor="#555555" uuid="8c871f52-989e-416f-9a35-20d4ce1c4c1b"/>
 			</line>
 			<line>
-				<reportElement key="line-9" stretchType="RelativeToBandHeight" x="60" y="-20" width="1" height="40" forecolor="#555555"/>
+				<reportElement key="line-9" stretchType="RelativeToBandHeight" x="60" y="-20" width="1" height="40" forecolor="#555555" uuid="ebe986df-8d25-4b21-9736-4286979e872b"/>
 			</line>
 			<line>
-				<reportElement key="line-12" stretchType="RelativeToBandHeight" x="20" y="-2" width="1" height="22" forecolor="#555555"/>
+				<reportElement key="line-12" stretchType="RelativeToBandHeight" x="20" y="-2" width="1" height="22" forecolor="#555555" uuid="f2bc874f-009b-48fd-bb92-603034693de0"/>
 			</line>
 			<line>
-				<reportElement key="line-26" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="20" forecolor="#555555"/>
+				<reportElement key="line-26" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="20" forecolor="#555555" uuid="1b0001f6-cbb1-4e30-bd3c-ee69a14713c9"/>
 			</line>
 		</band>
 	</detail>
@@ -561,7 +561,7 @@
 	<pageFooter>
 		<band height="20" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField-4" x="573" y="5" width="171" height="15" forecolor="#000000"/>
+				<reportElement key="textField-4" x="573" y="5" width="171" height="15" forecolor="#000000" uuid="8de6f6ec-8e26-4146-9b9a-b84acd1cc658"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -571,10 +571,10 @@
 				<textElement textAlignment="Right" verticalAlignment="Bottom">
 					<font fontName="Bitstream Vera Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
-				<reportElement key="textField-5" mode="Transparent" x="746" y="5" width="36" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField-5" mode="Transparent" x="746" y="5" width="36" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="93ab3149-915a-4981-85cf-bb72757996f1"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -584,10 +584,10 @@
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
 					<font fontName="Bitstream Vera Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-6" x="364" y="5" width="87" height="15" forecolor="#000000"/>
+				<reportElement key="textField-6" x="364" y="5" width="87" height="15" forecolor="#000000" uuid="b7920865-7676-4111-9bc2-1fbe4628bdc4"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -597,10 +597,10 @@
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
 					<font fontName="Bitstream Vera Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[new Date()]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-1" x="284" y="5" width="78" height="15" forecolor="#000000"/>
+				<reportElement key="staticText-1" x="284" y="5" width="78" height="15" forecolor="#000000" uuid="6a33663e-c02e-4fda-99c7-98399479ad71"/>
 				<box topPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java	Tue May 19 13:26:52 2015 +0200
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java	Mon May 25 12:31:46 2015 +0200
@@ -16,8 +16,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.HashMap;
@@ -37,20 +35,6 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import net.sf.jasperreports.engine.JRDataSource;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRExporterParameter;
-import net.sf.jasperreports.engine.JRParameter;
-import net.sf.jasperreports.engine.JasperExportManager;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.export.JExcelApiExporter;
-import net.sf.jasperreports.engine.export.JExcelApiExporterParameter;
-import net.sf.jasperreports.engine.export.JRHtmlExporter;
-import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
-import net.sf.jasperreports.engine.fill.JRSwapFileVirtualizer;
-import net.sf.jasperreports.engine.util.JRSwapFile;
-import net.sf.jasperreports.j2ee.servlets.ImageServlet;
 
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.criterion.Restrictions;
@@ -60,6 +44,8 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.secureApp.LoginUtils.RoleDefaults;
 import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.client.application.report.ReportingUtils;
+import org.openbravo.client.application.report.ReportingUtils.ExportType;
 import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
@@ -73,7 +59,6 @@
 import org.openbravo.erpCommon.security.SessionLogin;
 import org.openbravo.erpCommon.security.UsageAudit;
 import org.openbravo.erpCommon.utility.JRFieldProviderDataSource;
-import org.openbravo.erpCommon.utility.JRFormatFactory;
 import org.openbravo.erpCommon.utility.JRScrollableFieldProviderDataSource;
 import org.openbravo.erpCommon.utility.OBError;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
@@ -1262,19 +1247,10 @@
 
     ServletOutputStream os = null;
     UUID reportId = null;
-    JRSwapFileVirtualizer virtualizer = null;
     try {
-
-      final JasperReport jasperReport = Utility.getTranslatedJasperReport(this, strReportName,
-          strLanguage, strBaseDesign);
       if (designParameters == null)
         designParameters = new HashMap<String, Object>();
 
-      Boolean pagination = true;
-      if (strOutputType.equals("pdf"))
-        pagination = false;
-
-      designParameters.put("IS_IGNORE_PAGINATION", pagination);
       designParameters.put("BASE_WEB", strReplaceWithFull);
       designParameters.put("BASE_DESIGN", strBaseDesign);
       designParameters.put("ATTACH", strAttach);
@@ -1292,78 +1268,29 @@
           variables.getSessionValue("#AD_ReportNumberFormat"), dfs);
       designParameters.put("NUMBERFORMAT", numberFormat);
 
-      if (log4j.isDebugEnabled())
-        log4j.debug("creating the format factory: " + variables.getJavaDateFormat());
-      final JRFormatFactory jrFormatFactory = new JRFormatFactory();
-      jrFormatFactory.setDatePattern(variables.getJavaDateFormat());
-      designParameters.put(JRParameter.REPORT_FORMAT_FACTORY, jrFormatFactory);
-
-      // if no custom virtualizer is requested use a default one
-      if (!designParameters.containsKey(JRParameter.REPORT_VIRTUALIZER)) {
-        // virtualizer is essentially using a tmp-file to avoid huge memory consumption by jasper
-        // when processing big reports
-        JRSwapFile swap = new JRSwapFile(System.getProperty("java.io.tmpdir"), 4096, 1);
-        // start using the virtualizer when having more than 100 pages of data
-        virtualizer = new JRSwapFileVirtualizer(100, swap);
-        designParameters.put(JRParameter.REPORT_VIRTUALIZER, virtualizer);
-      }
-
-      JasperPrint jasperPrint;
-      Connection con = null;
-      try {
-        con = getTransactionConnection();
-        if (data != null) {
-          designParameters.put("REPORT_CONNECTION", con);
-          jasperPrint = JasperFillManager.fillReport(jasperReport, designParameters, data);
-        } else {
-          jasperPrint = JasperFillManager.fillReport(jasperReport, designParameters, con);
-        }
-      } catch (final Exception e) {
-        Throwable t = (e.getCause() != null) ? e.getCause().getCause() : null;
-        if (t != null) {
-          throw new ServletException((t instanceof SQLException && t.getMessage().contains(
-              "@NoConversionRate@")) ? t.getMessage() : e.getMessage(), e);
-        } else {
-          throw new ServletException(e.getCause() instanceof SQLException ? e.getCause()
-              .getMessage() : e.getMessage(), e);
-        }
-      } finally {
-        releaseRollbackConnection(con);
-      }
-
       os = response.getOutputStream();
       if (exportParameters == null)
         exportParameters = new HashMap<Object, Object>();
       if (strOutputType == null || strOutputType.equals(""))
         strOutputType = "html";
+      final ExportType expType = ExportType.getExportType(strOutputType.toUpperCase());
+
       if (strOutputType.equals("html")) {
         if (log4j.isDebugEnabled())
           log4j.debug("JR: Print HTML");
         response.setHeader("Content-disposition", "inline" + "; filename=" + strFileName + "."
             + strOutputType);
-        final JRHtmlExporter exporter = new JRHtmlExporter();
-        exportParameters.put(JRHtmlExporterParameter.JASPER_PRINT, jasperPrint);
-        exportParameters.put(JRHtmlExporterParameter.IS_USING_IMAGES_TO_ALIGN, Boolean.FALSE);
-        exportParameters.put(JRHtmlExporterParameter.SIZE_UNIT,
-            JRHtmlExporterParameter.SIZE_UNIT_POINT);
-        exportParameters.put(JRHtmlExporterParameter.OUTPUT_STREAM, os);
-
-        HttpSession session = (HttpSession) designParameters.get("HTTP_SESSION");
-        if (session != null) {
-          session.setAttribute(ImageServlet.DEFAULT_JASPER_PRINT_SESSION_ATTRIBUTE, jasperPrint);
-        }
-
         HttpServletRequest request = RequestContext.get().getRequest();
         String localAddress = HttpBaseUtils.getLocalAddress(request);
-        exportParameters.put(JRHtmlExporterParameter.IMAGES_URI, localAddress
-            + "/servlets/image?image=");
-
-        exporter.setParameters(exportParameters);
-        exporter.exportReport();
+        exportParameters.put(ReportingUtils.IMAGES_URI, localAddress + "/servlets/image?image={0}");
+        ReportingUtils.exportJR(strReportName, expType, designParameters, os, false, this, data,
+            exportParameters);
       } else if (strOutputType.equals("pdf") || strOutputType.equalsIgnoreCase("xls")) {
         reportId = UUID.randomUUID();
-        saveReport(variables, jasperPrint, exportParameters, strFileName + "-" + (reportId) + "."
-            + strOutputType);
+        File outputFile = new File(globalParameters.strFTPDirectory + "/" + strFileName + "-"
+            + (reportId) + "." + strOutputType);
+        ReportingUtils.exportJR(strReportName, expType, designParameters, outputFile, false, this,
+            data, exportParameters);
         response.setContentType("text/html;charset=UTF-8");
         response.setHeader("Content-disposition", "inline" + "; filename=" + strFileName + "-"
             + (reportId) + ".html");
@@ -1374,12 +1301,8 @@
           printPagePopUpDownload(response.getOutputStream(), strFileName + "-" + (reportId) + "."
               + strOutputType);
         }
-      } else {
-        throw new ServletException("Output format no supported");
       }
-    } catch (final JRException e) {
-      log4j.error("JR: Error: ", e);
-      throw new ServletException(e.getMessage(), e);
+
     } catch (IOException ioe) {
       try {
         FileUtility f = new FileUtility(globalParameters.strFTPDirectory, strFileName + "-"
@@ -1397,10 +1320,6 @@
         os.close();
       } catch (final Exception e) {
       }
-      // remove virtualizer tmp files if we created them
-      if (virtualizer != null) {
-        virtualizer.cleanup();
-      }
     }
   }
 
@@ -1446,41 +1365,6 @@
   }
 
   /**
-   * Saves the report on the attachments folder for future retrieval
-   * 
-   * @param vars
-   *          An instance of VariablesSecureApp that contains the request parameters
-   * @param jp
-   *          An instance of JasperPrint of the loaded JRXML template
-   * @param exportParameters
-   *          A Map with all the parameters passed to all reports
-   * @param fileName
-   *          The file name for the report
-   * @throws JRException
-   */
-  private void saveReport(VariablesSecureApp vars, JasperPrint jp,
-      Map<Object, Object> exportParameters, String fileName) throws JRException {
-    final String outputFile = globalParameters.strFTPDirectory + "/" + fileName;
-    final String reportType = fileName.substring(fileName.lastIndexOf(".") + 1);
-    if (reportType.equalsIgnoreCase("pdf")) {
-      JasperExportManager.exportReportToPdfFile(jp, outputFile);
-    } else if (reportType.equalsIgnoreCase("xls")) {
-      JExcelApiExporter exporter = new JExcelApiExporter();
-      exportParameters.put(JRExporterParameter.JASPER_PRINT, jp);
-      exportParameters.put(JRExporterParameter.OUTPUT_FILE_NAME, outputFile);
-      exportParameters.put(JExcelApiExporterParameter.IS_ONE_PAGE_PER_SHEET, Boolean.FALSE);
-      exportParameters.put(JExcelApiExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS,
-          Boolean.TRUE);
-      exportParameters.put(JExcelApiExporterParameter.IS_DETECT_CELL_TYPE, true);
-      exporter.setParameters(exportParameters);
-      exporter.exportReport();
-    } else {
-      throw new JRException("Report type not supported");
-    }
-
-  }
-
-  /**
    * Forwards request to the referrer servlet to perform operations like "auto-save" Note: The
    * referrer servlet should have a hidden input field with mappingName (e.g.
    * /PurchaOrder/Header_Edition.html) to be able to get a RequestDispatcher
--- a/src/org/openbravo/erpCommon/ad_process/JasperProcess.java	Tue May 19 13:26:52 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/JasperProcess.java	Mon May 25 12:31:46 2015 +0200
@@ -1,6 +1,23 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2008-2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
 package org.openbravo.erpCommon.ad_process;
 
-import java.sql.Connection;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.HashMap;
@@ -9,42 +26,27 @@
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRExporterParameter;
-import net.sf.jasperreports.engine.JRParameter;
-import net.sf.jasperreports.engine.JasperExportManager;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.export.JExcelApiExporter;
-import net.sf.jasperreports.engine.export.JExcelApiExporterParameter;
-import net.sf.jasperreports.engine.export.JRHtmlExporter;
-import net.sf.jasperreports.engine.export.JRHtmlExporterParameter;
-
 import org.apache.log4j.Logger;
 import org.openbravo.base.ConfigParameters;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.client.application.report.ReportingUtils;
+import org.openbravo.client.application.report.ReportingUtils.ExportType;
 import org.openbravo.data.FieldProvider;
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.erpCommon.utility.JRFieldProviderDataSource;
-import org.openbravo.erpCommon.utility.JRFormatFactory;
 import org.openbravo.erpCommon.utility.PrintJRData;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.scheduling.Process;
 import org.openbravo.scheduling.ProcessBundle;
-import org.openbravo.scheduling.ProcessLogger;
 import org.openbravo.utils.Replace;
 
 public class JasperProcess implements Process {
 
   static Logger log4j = Logger.getLogger(JasperProcess.class);
 
-  private ProcessLogger logger;
-
   private ConnectionProvider connection;
 
   public void initialize(ProcessBundle bundle) {
-    logger = bundle.getLogger();
     connection = bundle.getConnection();
   }
 
@@ -79,22 +81,13 @@
 
     strReportName = Replace.replace(Replace.replace(strReportName, "@basedesign@", strBaseDesign),
         "@attach@", strAttach);
-    String strFileName = strReportName.substring(strReportName.lastIndexOf("/") + 1);
 
     // FIXME: os is never assigned, but used leading to an NPE
     ServletOutputStream os = null;
     try {
-      JasperReport jasperReport = Utility.getTranslatedJasperReport(connection, strReportName,
-          strLanguage, strBaseDesign);
-
       if (designParameters == null)
         designParameters = new HashMap<String, Object>();
 
-      Boolean pagination = true;
-      if (strOutputType.equals("pdf"))
-        pagination = false;
-
-      designParameters.put("IS_IGNORE_PAGINATION", pagination);
       // designParameters.put("BASE_WEB", strReplaceWithFull);
       designParameters.put("BASE_DESIGN", strBaseDesign);
       designParameters.put("ATTACH", strAttach);
@@ -110,79 +103,15 @@
           vars.getSessionValue("#AD_ReportNumberFormat"), dfs);
       designParameters.put("NUMBERFORMAT", numberFormat);
 
-      if (log4j.isDebugEnabled())
-        log4j.debug("creating the format factory: " + vars.getJavaDateFormat());
-      JRFormatFactory jrFormatFactory = new JRFormatFactory();
-      jrFormatFactory.setDatePattern(vars.getJavaDateFormat());
-      designParameters.put(JRParameter.REPORT_FORMAT_FACTORY, jrFormatFactory);
-
-      JasperPrint jasperPrint;
-      Connection conn = null;
-      try {
-        conn = connection.getTransactionConnection();
-        if (data != null) {
-          designParameters.put("REPORT_CONNECTION", conn);
-          jasperPrint = JasperFillManager.fillReport(jasperReport, designParameters,
-              new JRFieldProviderDataSource(data, vars.getJavaDateFormat()));
-        } else {
-          jasperPrint = JasperFillManager.fillReport(jasperReport, designParameters, conn);
-        }
-      } catch (Exception e) {
-        throw new ServletException(e.getMessage());
-      } finally {
-        connection.releaseRollbackConnection(conn);
-      }
-
       if (exportParameters == null)
         exportParameters = new HashMap<Object, Object>();
       if (strOutputType == null || strOutputType.equals(""))
         strOutputType = "html";
-      if (strOutputType.equals("html")) {
-        if (log4j.isDebugEnabled())
-          log4j.debug("JR: Print HTML");
-        // response.setHeader( "Content-disposition", "inline" +
-        // "; filename=" + strFileName + "." +strOutputType);
-        JRHtmlExporter exporter = new JRHtmlExporter();
-        exportParameters.put(JRHtmlExporterParameter.JASPER_PRINT, jasperPrint);
-        exportParameters.put(JRHtmlExporterParameter.IS_USING_IMAGES_TO_ALIGN, Boolean.FALSE);
-        exportParameters.put(JRHtmlExporterParameter.SIZE_UNIT,
-            JRHtmlExporterParameter.SIZE_UNIT_POINT);
-        exportParameters.put(JRHtmlExporterParameter.OUTPUT_STREAM, os);
-        exporter.setParameters(exportParameters);
-        exporter.exportReport();
-
-      } else if (strOutputType.equals("pdf")) {
-        // response.setContentType("application/pdf");
-        // response.setHeader( "Content-disposition", "attachment" +
-        // "; filename=" + strFileName + "." +strOutputType);
-        JasperExportManager.exportReportToPdfStream(jasperPrint, os);
-
-      } else if (strOutputType.equals("xls")) {
-        // response.setContentType("application/vnd.ms-excel");
-        // response.setHeader( "Content-disposition", "attachment" +
-        // "; filename=" + strFileName + "." +strOutputType);
-        JExcelApiExporter exporter = new JExcelApiExporter();
-        exportParameters.put(JRExporterParameter.JASPER_PRINT, jasperPrint);
-        exportParameters.put(JRExporterParameter.OUTPUT_STREAM, os);
-        exportParameters.put(JExcelApiExporterParameter.IS_ONE_PAGE_PER_SHEET, Boolean.FALSE);
-        exportParameters.put(JExcelApiExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS,
-            Boolean.TRUE);
-
-        exporter.setParameters(exportParameters);
-        exporter.exportReport();
-
-      } else {
-        throw new ServletException("Output format no supported");
-      }
-    } catch (JRException e) {
-      if (log4j.isDebugEnabled())
-        log4j.debug("JR: Error: " + e);
-      e.printStackTrace();
-      throw new ServletException(e.getMessage());
-
+      final ExportType expType = ExportType.getExportType(strOutputType.toUpperCase());
+      ReportingUtils.exportJR(strReportName, expType, designParameters, os, false, connection,
+          new JRFieldProviderDataSource(data, vars.getJavaDateFormat()), exportParameters);
     } catch (Exception e) {
       throw new ServletException(e.getMessage());
-
     } finally {
       try {
         os.close();
--- a/src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Customer Statement" pageWidth="595" pageHeight="842" whenNoDataType="NoPages" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Customer Statement" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="497a0ae3-5aac-448b-a8a4-4b6619407498">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="1.2100000000000006"/>
@@ -195,26 +195,27 @@
 		<groupHeader>
 			<band height="78">
 				<textField isStretchWithOverflow="true" evaluationTime="Report" pattern="" isBlankWhenNull="true">
-					<reportElement style="Detail_Line" stretchType="RelativeToTallestObject" mode="Transparent" x="446" y="56" width="110" height="14" forecolor="#000000" backcolor="#FFFFFF">
+					<reportElement style="Detail_Line" stretchType="RelativeToTallestObject" mode="Transparent" x="446" y="56" width="110" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="bab14b42-0911-481b-84b2-200ab637a727">
 						<printWhenExpression><![CDATA[($P{reportType}.equals("cus")) || ($P{reportType}.equals("both") && $F{issotrx}.equals("Y"))]]></printWhenExpression>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 						<font fontName="DejaVu Sans" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$V{customerInitialBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{customerInitialBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{customerInitialBalance})]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$V{customerInitialBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{customerInitialBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{customerInitialBalance})]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="331" y="56" width="115" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement x="331" y="56" width="115" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="b7fa0a14-eaf8-4ba3-8f63-b539a95d5c7f"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="DejaVu Sans" size="10" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Initial Balance :]]></text>
 				</staticText>
 				<line>
-					<reportElement x="331" y="70" width="225" height="1"/>
+					<reportElement x="331" y="70" width="225" height="1" uuid="0324ab00-5242-4117-bc12-2413a8568017"/>
 				</line>
 				<staticText>
-					<reportElement x="0" y="7" width="330" height="20" forecolor="#595959">
+					<reportElement x="0" y="7" width="330" height="20" forecolor="#595959" uuid="bfae711e-d1a9-41a6-ab3e-ee8818f58e76">
 						<printWhenExpression><![CDATA[$P{reportType}.equals("both") && $F{issotrx}.equals("Y")]]></printWhenExpression>
 					</reportElement>
 					<textElement>
@@ -223,52 +224,52 @@
 					<text><![CDATA[Customer Statement]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="128" y="36" width="202" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement x="128" y="36" width="202" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="6c954583-0980-4275-b5c6-94726deb66fb"/>
 					<textElement textAlignment="Left" verticalAlignment="Top">
 						<font fontName="DejaVu Sans" size="8" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Description]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="0" y="36" width="47" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement x="0" y="36" width="47" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="41e42641-3f87-4355-9e24-f48fe98633d1"/>
 					<textElement verticalAlignment="Top">
 						<font fontName="DejaVu Sans" size="8" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Date]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="47" y="36" width="81" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement x="47" y="36" width="81" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="2684e5bb-9e7f-4006-9a50-334a26bc8144"/>
 					<textElement textAlignment="Left" verticalAlignment="Top">
 						<font fontName="DejaVu Sans" size="8" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Document Type]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="330" y="36" width="75" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement x="330" y="36" width="75" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="1a9426e0-9cd4-444a-84e4-2ef7f31d0115"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="DejaVu Sans" size="8" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Debit]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="405" y="36" width="75" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement x="405" y="36" width="75" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="a6803da0-801c-473c-9122-0fdae0ad6b4c"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="DejaVu Sans" size="8" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Credit]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="480" y="36" width="75" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement x="480" y="36" width="75" height="13" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="550e60d2-54e1-410d-8059-90e8bc32ac01"/>
 					<textElement textAlignment="Right" verticalAlignment="Top">
 						<font fontName="DejaVu Sans" size="8" isBold="true"/>
 					</textElement>
 					<text><![CDATA[Net]]></text>
 				</staticText>
 				<line>
-					<reportElement x="0" y="49" width="555" height="1"/>
+					<reportElement x="0" y="49" width="555" height="1" uuid="750cccdd-cdc1-4e35-8fef-cd0bc3440eff"/>
 				</line>
 				<staticText>
-					<reportElement x="1" y="7" width="330" height="20" forecolor="#595959">
+					<reportElement x="1" y="7" width="330" height="20" forecolor="#595959" uuid="fcaab7ce-176e-4b44-81c4-a9df9f2bb719">
 						<printWhenExpression><![CDATA[$P{reportType}.equals("both") && $F{issotrx}.equals("N")]]></printWhenExpression>
 					</reportElement>
 					<textElement>
@@ -277,50 +278,54 @@
 					<text><![CDATA[Vendor Statement]]></text>
 				</staticText>
 				<textField isStretchWithOverflow="true" evaluationTime="Report" pattern="" isBlankWhenNull="true">
-					<reportElement style="Detail_Line" stretchType="RelativeToTallestObject" mode="Transparent" x="446" y="56" width="110" height="14" forecolor="#000000" backcolor="#FFFFFF">
+					<reportElement style="Detail_Line" stretchType="RelativeToTallestObject" mode="Transparent" x="446" y="56" width="110" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="0af3ed56-3508-44dd-aeb6-4e3ff0c30acd">
 						<printWhenExpression><![CDATA[($P{reportType}.equals("ven")) || ($P{reportType}.equals("both") && $F{issotrx}.equals("N"))]]></printWhenExpression>
 					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 						<font fontName="DejaVu Sans" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$V{vendorInitialBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{vendorInitialBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{vendorInitialBalance})]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$V{vendorInitialBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{vendorInitialBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{vendorInitialBalance})]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="44">
 				<textField evaluationTime="Group" evaluationGroup="Customer" pattern="" isBlankWhenNull="true">
-					<reportElement positionType="Float" mode="Transparent" x="445" y="12" width="110" height="15" forecolor="#000000" backcolor="#FFFFFF">
+					<reportElement positionType="Float" mode="Transparent" x="445" y="12" width="110" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="a75fd489-5f32-4dba-adc8-d961d69350fe">
 						<printWhenExpression><![CDATA[($P{reportType}.equals("cus")) || ($P{reportType}.equals("both") && $F{issotrx}.equals("Y"))]]></printWhenExpression>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 						<font fontName="DejaVu Sans" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$V{customerBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{customerBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{customerBalance})]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$V{customerBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{customerBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{customerBalance})]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement positionType="Float" mode="Opaque" x="330" y="12" width="115" height="15" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+					<reportElement positionType="Float" mode="Opaque" x="330" y="12" width="115" height="15" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="8d228eb8-2fde-4f0a-9bfb-b6ee85f1eb54"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 						<font fontName="DejaVu Sans" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
 					</textElement>
 					<text><![CDATA[Balance :]]></text>
 				</staticText>
 				<line>
-					<reportElement x="330" y="27" width="225" height="1"/>
+					<reportElement x="330" y="27" width="225" height="1" uuid="ba5bc91e-a835-4136-8823-f5bffa8b544b"/>
 				</line>
 				<line>
-					<reportElement x="330" y="29" width="225" height="1"/>
+					<reportElement x="330" y="29" width="225" height="1" uuid="d705d5a1-56f8-4f10-80fb-171f41cf12a9"/>
 				</line>
 				<textField evaluationTime="Group" evaluationGroup="Customer" pattern="" isBlankWhenNull="true">
-					<reportElement positionType="Float" mode="Transparent" x="445" y="12" width="110" height="15" forecolor="#000000" backcolor="#FFFFFF">
+					<reportElement positionType="Float" mode="Transparent" x="445" y="12" width="110" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="5ebb7055-46fa-4b7a-bf93-a40c5a017d07">
 						<printWhenExpression><![CDATA[($P{reportType}.equals("ven")) || ($P{reportType}.equals("both") && $F{issotrx}.equals("N"))]]></printWhenExpression>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+					<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 						<font fontName="DejaVu Sans" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$V{vendorBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{vendorBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{vendorBalance})]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$V{vendorBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{vendorBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{vendorBalance})]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupFooter>
@@ -334,36 +339,36 @@
 	<pageHeader>
 		<band height="146" splitType="Stretch">
 			<rectangle>
-				<reportElement x="0" y="0" width="559" height="77" forecolor="#FFFFFF" backcolor="#FFFFFF"/>
+				<reportElement x="0" y="0" width="559" height="77" forecolor="#FFFFFF" backcolor="#FFFFFF" uuid="a61f942d-14ea-46fc-865a-0fd446b65e6f"/>
 			</rectangle>
 			<image scaleImage="RetainShape" hAlign="Center" vAlign="Middle" isUsingCache="true">
-				<reportElement key="image-1" x="10" y="4" width="205" height="55"/>
-				<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylegal", $F{organizationid})]]></imageExpression>
+				<reportElement key="image-1" x="10" y="4" width="205" height="55" uuid="73a5995d-9060-4607-b691-814fd83574d6"/>
+				<imageExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylegal", $F{organizationid})]]></imageExpression>
 			</image>
 			<textField>
-				<reportElement x="490" y="48" width="59" height="11"/>
+				<reportElement x="490" y="48" width="59" height="11" uuid="715f1869-f95e-466f-9cb4-bf0ae163334c"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="9" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT,
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT,
         $P{LOCALE}).format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="0" y="101" width="371" height="12"/>
+				<reportElement x="0" y="101" width="371" height="12" uuid="9c171589-afee-4689-82e1-1bf6ef256481"/>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="10" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{bpname}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{bpname}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="10" y="59" width="301" height="12" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true" forecolor="#595959"/>
+				<reportElement x="10" y="59" width="301" height="12" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true" forecolor="#595959" uuid="714e47f3-816e-4fc3-ae02-57bb0a15be40"/>
 				<textElement>
 					<font fontName="DejaVu Sans" size="9"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{org_address} + " " + $F{org_postal}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{org_address} + " " + $F{org_postal}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="236" y="4" width="313" height="20" forecolor="#595959">
+				<reportElement x="236" y="4" width="313" height="20" forecolor="#595959" uuid="d4dc815c-b252-4559-ad05-71cf8cb0029a">
 					<printWhenExpression><![CDATA[$P{reportType}.equals("cus") && $F{issotrx}.equals("Y")]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right">
@@ -372,70 +377,70 @@
 				<text><![CDATA[Customer Statement]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="371" y="48" width="119" height="11" isPrintWhenDetailOverflows="true" forecolor="#595959"/>
+				<reportElement x="371" y="48" width="119" height="11" isPrintWhenDetailOverflows="true" forecolor="#595959" uuid="27172c38-5715-434d-9031-b5e0bde7fb17"/>
 				<textElement textAlignment="Right">
 					<font fontName="DejaVu Sans" size="9"/>
 				</textElement>
 				<text><![CDATA[Issued]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="515" y="101" width="12" height="12"/>
+				<reportElement x="515" y="101" width="12" height="12" uuid="a47d2f0f-04c2-44f0-b11d-d0a2a91b159d"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="483" y="101" width="32" height="12" isPrintWhenDetailOverflows="true"/>
+				<reportElement x="483" y="101" width="32" height="12" isPrintWhenDetailOverflows="true" uuid="9a3bae21-c7d1-4187-a004-43f58364b284"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
 				<text><![CDATA[Page]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="527" y="101" width="11" height="12"/>
+				<reportElement x="527" y="101" width="11" height="12" uuid="7f781088-a5a6-4588-a67e-87ab7281fb70"/>
 				<textElement textAlignment="Justified" verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
 				<text><![CDATA[of]]></text>
 			</staticText>
 			<textField evaluationTime="Report">
-				<reportElement positionType="Float" x="538" y="101" width="12" height="12"/>
+				<reportElement positionType="Float" x="538" y="101" width="12" height="12" uuid="e5239722-8262-456f-901e-2e2f2b4d6c72"/>
 				<textElement textAlignment="Justified" verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.Integer"><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="0" y="124" width="32" height="12"/>
+				<reportElement x="0" y="124" width="32" height="12" uuid="bfddfcad-55b3-4e95-9f35-d3fd940bb3b8"/>
 				<textElement verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="10" isBold="false"/>
 				</textElement>
 				<text><![CDATA[From]]></text>
 			</staticText>
 			<textField evaluationTime="Report">
-				<reportElement x="33" y="124" width="45" height="12"/>
+				<reportElement x="33" y="124" width="45" height="12" uuid="0d10c075-8588-4aba-b65a-7216a84b11ad"/>
 				<textElement textAlignment="Right" verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="10" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DateFrom} != null ? DateFormat.getDateInstance(DateFormat.SHORT,$P{LOCALE}).format($P{DATEFORMAT}.parse($P{DateFrom}))  : DateFormat.getDateInstance(DateFormat.SHORT,$P{LOCALE}).format($V{DateFrom})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DateFrom} != null ? DateFormat.getDateInstance(DateFormat.SHORT,$P{LOCALE}).format($P{DATEFORMAT}.parse($P{DateFrom}))  : DateFormat.getDateInstance(DateFormat.SHORT,$P{LOCALE}).format($V{DateFrom})]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement x="96" y="124" width="45" height="12"/>
+				<reportElement x="96" y="124" width="45" height="12" uuid="92cbe9ad-289f-4912-b262-215fae340e01"/>
 				<textElement verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="10" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{DateTo}  != null ? DateFormat.getDateInstance(DateFormat.SHORT,$P{LOCALE}).format($P{DATEFORMAT}.parse($P{DateTo})) : DateFormat.getDateInstance(DateFormat.SHORT,$P{LOCALE}).format($V{DateTo})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{DateTo}  != null ? DateFormat.getDateInstance(DateFormat.SHORT,$P{LOCALE}).format($P{DATEFORMAT}.parse($P{DateTo})) : DateFormat.getDateInstance(DateFormat.SHORT,$P{LOCALE}).format($V{DateTo})]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="78" y="124" width="18" height="12"/>
+				<reportElement x="78" y="124" width="18" height="12" uuid="5cf7ca7b-3437-4ecb-8a88-06fdc9224186"/>
 				<textElement textAlignment="Center" verticalAlignment="Bottom">
 					<font fontName="DejaVu Sans" size="10" isBold="false"/>
 				</textElement>
 				<text><![CDATA[to]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="235" y="4" width="314" height="20" isPrintWhenDetailOverflows="true" forecolor="#595959">
+				<reportElement x="235" y="4" width="314" height="20" isPrintWhenDetailOverflows="true" forecolor="#595959" uuid="994be6a7-05b5-4ef9-9577-2ed953b20190">
 					<printWhenExpression><![CDATA[$P{reportType}.equals("ven") && $F{issotrx}.equals("N")]]></printWhenExpression>
 				</reportElement>
 				<textElement textAlignment="Right">
@@ -448,49 +453,55 @@
 	<detail>
 		<band height="17">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="47" height="14"/>
+				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="47" height="14" uuid="9c631d3f-0a97-4b1a-91da-50e30e36d6f5"/>
 				<box leftPadding="3"/>
-				<textElement verticalAlignment="Middle" lineSpacing="1_1_2">
+				<textElement verticalAlignment="Middle">
 					<font fontName="DejaVu Sans" size="8"/>
+					<paragraph lineSpacing="1_1_2"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT,
+				<textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.SHORT,
         $P{LOCALE}).format($F{dateacct})]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="47" y="0" width="81" height="14"/>
-				<textElement verticalAlignment="Middle" lineSpacing="1_1_2">
+				<reportElement stretchType="RelativeToTallestObject" x="47" y="0" width="81" height="14" uuid="e2f6368f-f0af-4bf7-83a2-79d74f1f5b6a"/>
+				<textElement verticalAlignment="Middle">
 					<font fontName="DejaVu Sans" size="8"/>
+					<paragraph lineSpacing="1_1_2"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{documenttype}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{documenttype}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="128" y="0" width="202" height="14"/>
-				<textElement verticalAlignment="Middle" lineSpacing="1_1_2">
+				<reportElement stretchType="RelativeToTallestObject" x="128" y="0" width="202" height="14" uuid="67088f29-11e9-4552-8f4f-bf88390a29d8"/>
+				<textElement verticalAlignment="Middle">
 					<font fontName="DejaVu Sans" size="8"/>
+					<paragraph lineSpacing="1_1_2"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{description}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{description}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="405" y="0" width="75" height="14"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" lineSpacing="1_1_2">
+				<reportElement stretchType="RelativeToTallestObject" x="405" y="0" width="75" height="14" uuid="37b11b94-f0ef-4332-a602-0addfc0a8980"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="DejaVu Sans" size="8"/>
+					<paragraph lineSpacing="1_1_2"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{credit}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($F{credit}.abs()) + ")" : $P{NUMBERFORMAT}.format($F{credit})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{credit}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($F{credit}.abs()) + ")" : $P{NUMBERFORMAT}.format($F{credit})]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="330" y="0" width="75" height="14"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" lineSpacing="1_1_2">
+				<reportElement stretchType="RelativeToTallestObject" x="330" y="0" width="75" height="14" uuid="b9cb19fe-6b55-4c0c-9089-a3c3c8e88223"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="DejaVu Sans" size="8"/>
+					<paragraph lineSpacing="1_1_2"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{debit}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($F{debit}.abs()) + ")" : $P{NUMBERFORMAT}.format($F{debit})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{debit}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($F{debit}.abs()) + ")" : $P{NUMBERFORMAT}.format($F{debit})]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="480" y="0" width="75" height="14"/>
+				<reportElement stretchType="RelativeToTallestObject" x="480" y="0" width="75" height="14" uuid="50a77f9b-8c48-4f56-837c-590c02bf0166"/>
 				<box rightPadding="3"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" lineSpacing="1_1_2">
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font fontName="DejaVu Sans" size="8"/>
+					<paragraph lineSpacing="1_1_2"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$V{SUM}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{SUM}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{SUM})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{SUM}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{SUM}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{SUM})]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
@@ -498,42 +509,45 @@
 		<band height="66" splitType="Stretch">
 			<printWhenExpression><![CDATA[$P{reportType}.equals("both")]]></printWhenExpression>
 			<textField isStretchWithOverflow="true" evaluationTime="Report" pattern="" isBlankWhenNull="true">
-				<reportElement style="Detail_Line" stretchType="RelativeToTallestObject" mode="Transparent" x="445" y="13" width="110" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+				<reportElement style="Detail_Line" stretchType="RelativeToTallestObject" mode="Transparent" x="445" y="13" width="110" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="db8ea373-d4a6-4a80-9543-edb9914382c4"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="DejaVu Sans" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$V{totalInitialBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{totalInitialBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{totalInitialBalance})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{totalInitialBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{totalInitialBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{totalInitialBalance})]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="235" y="13" width="210" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement x="235" y="13" width="210" height="14" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="62499066-a0e4-46b3-bd28-3e611823c5dd"/>
 				<textElement textAlignment="Right" verticalAlignment="Top">
 					<font fontName="DejaVu Sans" size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[Business Partner Initial Balance :]]></text>
 			</staticText>
 			<line>
-				<reportElement x="235" y="27" width="320" height="1"/>
+				<reportElement x="235" y="27" width="320" height="1" uuid="cd37578f-91ec-4417-ad1c-e1f2889f6d6a"/>
 			</line>
 			<staticText>
-				<reportElement positionType="Float" mode="Opaque" x="235" y="42" width="210" height="15" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+				<reportElement positionType="Float" mode="Opaque" x="235" y="42" width="210" height="15" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF" uuid="4b7939f4-7137-4121-a9e9-687b1e20cc84"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="DejaVu Sans" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<text><![CDATA[Business Partner Balance :]]></text>
 			</staticText>
 			<line>
-				<reportElement x="235" y="55" width="320" height="3"/>
+				<reportElement x="235" y="55" width="320" height="3" uuid="5d70d63d-44fd-446f-ba3f-04bfa9101df7"/>
 			</line>
 			<textField evaluationTime="Report" pattern="" isBlankWhenNull="true">
-				<reportElement positionType="Float" mode="Transparent" x="445" y="42" width="110" height="15" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement positionType="Float" mode="Transparent" x="445" y="42" width="110" height="15" forecolor="#000000" backcolor="#FFFFFF" uuid="3d009a3e-d394-4eba-a4f7-7b29d5b99f74"/>
 				<box rightPadding="5"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" lineSpacing="Single" markup="none">
+				<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="DejaVu Sans" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$V{totalBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{totalBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{totalBalance})]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{totalBalance}.compareTo(BigDecimal.ZERO) < 0 ? "(" + $P{NUMBERFORMAT}.format($V{totalBalance}.abs()) + ")" : $P{NUMBERFORMAT}.format($V{totalBalance})]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement x="235" y="57" width="320" height="3"/>
+				<reportElement x="235" y="57" width="320" height="3" uuid="382bf123-c27c-426b-a320-1a2df3a239e9"/>
 			</line>
 		</band>
 	</summary>
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="GeneralAccountingReportsPDF" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="GeneralAccountingReportsPDF" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="1de34766-77d8-4a3a-9223-88d6ac76dcb9">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<property name="ireport.zoom" value="1.5"/>
@@ -73,17 +73,17 @@
 	<pageHeader>
 		<band height="121" splitType="Stretch">
 			<textField>
-				<reportElement key="staticText-15" x="0" y="0" width="535" height="18"/>
+				<reportElement key="staticText-15" x="0" y="0" width="535" height="18" uuid="793d4469-26a6-483e-ab31-d93d39e76902"/>
 				<textElement textAlignment="Center" markup="none">
 					<font fontName="DejaVu Sans" size="12" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{principalTitle}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{principalTitle}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-1" x="0" y="71" width="535" height="1" forecolor="#555555"/>
+				<reportElement key="line-1" x="0" y="71" width="535" height="1" forecolor="#555555" uuid="13b43add-025a-45e9-8995-1919aab54746"/>
 			</line>
 			<staticText>
-				<reportElement key="staticText-7" x="0" y="23" width="37" height="14"/>
+				<reportElement key="staticText-7" x="0" y="23" width="37" height="14" uuid="44053d39-9800-4d28-a4e4-44ca6bf0d50a"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -96,21 +96,21 @@
 				<text><![CDATA[Client:]]></text>
 			</staticText>
 			<textField>
-				<reportElement key="staticText-7" x="37" y="23" width="192" height="14"/>
+				<reportElement key="staticText-7" x="37" y="23" width="192" height="14" uuid="15801ca4-e016-499d-9f57-831ce66fa6e5"/>
 				<textElement markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{companyName}+ " "+ $P{agnoInitial}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{companyName}+ " "+ $P{agnoInitial}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="staticText-7" x="464" y="23" width="71" height="14"/>
+				<reportElement key="staticText-7" x="464" y="23" width="71" height="14" uuid="fef3282d-269a-49b4-8b55-9dc10e37132b"/>
 				<textElement markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{date}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{date}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-7" x="436" y="23" width="28" height="14"/>
+				<reportElement key="staticText-7" x="436" y="23" width="28" height="14" uuid="1d78c0bb-21e3-44ad-9593-fb220dd65c7b"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -123,14 +123,14 @@
 				<text><![CDATA[Date:]]></text>
 			</staticText>
 			<textField>
-				<reportElement key="staticText-7" x="298" y="23" width="138" height="14"/>
+				<reportElement key="staticText-7" x="298" y="23" width="138" height="14" uuid="7eb0f2ad-8837-4b6a-9aaf-56fb0a68066c"/>
 				<textElement markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{org}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{org}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-7" x="229" y="23" width="69" height="14"/>
+				<reportElement key="staticText-7" x="229" y="23" width="69" height="14" uuid="98412d72-0776-43cc-9d76-11ebff6928ed"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -143,14 +143,14 @@
 				<text><![CDATA[Organization:]]></text>
 			</staticText>
 			<textField>
-				<reportElement key="staticText-7" x="62" y="39" width="473" height="14"/>
+				<reportElement key="staticText-7" x="62" y="39" width="473" height="14" uuid="635971d7-1490-4325-8ce9-c5d984c70edf"/>
 				<textElement markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Period:" + $P{period} + "   Period N-1"+ $P{periodRef}]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Period:" + $P{period} + "   Period N-1"+ $P{periodRef}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-7" x="0" y="39" width="62" height="14"/>
+				<reportElement key="staticText-7" x="0" y="39" width="62" height="14" uuid="5d291dd0-76ee-427b-b14d-876305a70c2d"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -163,49 +163,50 @@
 				<text><![CDATA[Conditions:]]></text>
 			</staticText>
 			<line>
-				<reportElement key="line-1" x="0" y="19" width="535" height="1"/>
+				<reportElement key="line-1" x="0" y="19" width="535" height="1" uuid="9b16adcc-98b9-48b6-be1e-aec1543c663e"/>
 			</line>
 			<textField>
-				<reportElement key="staticText-7" x="63" y="55" width="472" height="14"/>
+				<reportElement key="staticText-7" x="63" y="55" width="472" height="14" uuid="c0639c17-692f-40ee-9658-e6db7759fb98"/>
 				<textElement markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Client N-1: "+ $P{companyName}+ " " +$P{agnoRef}]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Client N-1: "+ $P{companyName}+ " " +$P{agnoRef}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="staticText-7" x="211" y="84" width="112" height="11"/>
+				<reportElement key="staticText-7" x="211" y="84" width="112" height="11" uuid="9274a660-0e3b-4319-9335-a95c0f3b01b7"/>
 				<textElement markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{agno}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{agno}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-7" mode="Transparent" x="0" y="94" width="112" height="10" forecolor="#000000" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Left" rotation="None" lineSpacing="Single" markup="none">
+				<reportElement key="staticText-7" mode="Transparent" x="0" y="94" width="112" height="10" forecolor="#000000" backcolor="#FFFFFF" uuid="467c5340-b7bc-4283-a149-7d8e324f5db4"/>
+				<textElement textAlignment="Left" rotation="None" markup="none">
 					<font fontName="DejaVu Sans" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<text><![CDATA[Element]]></text>
 			</staticText>
 			<textField>
-				<reportElement key="staticText-7" x="376" y="94" width="80" height="10"/>
+				<reportElement key="staticText-7" x="376" y="94" width="80" height="10" uuid="199ddce2-e209-4e39-80c1-d9e08964e38c"/>
 				<textElement textAlignment="Right" markup="none">
 					<font fontName="DejaVu Sans" size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{column}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{column}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="staticText-7" x="455" y="94" width="80" height="10"/>
+				<reportElement key="staticText-7" x="455" y="94" width="80" height="10" uuid="a46072dd-19c2-4305-82a2-12251937fcde"/>
 				<textElement textAlignment="Right" markup="none">
 					<font fontName="DejaVu Sans" size="8" isBold="true"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{columnRef}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{columnRef}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement key="staticText-7" x="0" y="74" width="229" height="12"/>
+				<reportElement key="staticText-7" x="0" y="74" width="229" height="12" uuid="1c526f90-e915-4987-94ef-85a93e688e29"/>
 				<textElement markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{groupname}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{groupname}]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageHeader>
@@ -215,25 +216,25 @@
 	<detail>
 		<band height="15" splitType="Stretch">
 			<textField>
-				<reportElement key="staticText-7" style="CustSatIndexMarkup" x="0" y="0" width="376" height="14"/>
+				<reportElement key="staticText-7" style="CustSatIndexMarkup" x="0" y="0" width="376" height="14" uuid="c4215005-6242-46f7-a913-de5861f16db1"/>
 				<textElement markup="none">
 					<font fontName="DejaVu Sans"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{elementLevel}>=4 ? "      " + $F{name}: $F{elementLevel}==3 ? "     " + $F{name}: $F{elementLevel}==2 ? "  " + $F{name}:$F{name}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{elementLevel}>=4 ? "      " + $F{name}: $F{elementLevel}==3 ? "     " + $F{name}: $F{elementLevel}==2 ? "  " + $F{name}:$F{name}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="staticText-7" x="376" y="0" width="80" height="14"/>
+				<reportElement key="staticText-7" x="376" y="0" width="80" height="14" uuid="58238d0b-9368-44df-a023-b80d1291b4ce"/>
 				<textElement textAlignment="Right" markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{qty}!=null) ? $P{NUMBERFORMAT}.format($F{qty}).toString() : new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{qty}!=null) ? $P{NUMBERFORMAT}.format($F{qty}).toString() : new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="staticText-7" x="455" y="0" width="80" height="14"/>
+				<reportElement key="staticText-7" x="455" y="0" width="80" height="14" uuid="9eef38aa-b277-4b7d-9312-6788aa0678d5"/>
 				<textElement textAlignment="Right" markup="none">
 					<font fontName="DejaVu Sans" size="9" isBold="false"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{qtyRef}!=null) ? $P{NUMBERFORMAT}.format($F{qtyRef}).toString() : new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{qtyRef}!=null) ? $P{NUMBERFORMAT}.format($F{qtyRef}).toString() : new String(" ")]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportAgingBalance" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportAgingBalance" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="3547a519-9e65-4956-98c7-f0145bad4e3b">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<import value="net.sf.jasperreports.engine.*"/>
@@ -105,7 +105,7 @@
 	<title>
 		<band height="73" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-17" style="Report_Footer" x="1" y="37" width="294" height="28"/>
+				<reportElement key="staticText-17" style="Report_Footer" x="1" y="37" width="294" height="28" uuid="a2e1b5da-5cba-445f-8771-6c5b81288950"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -118,14 +118,14 @@
 				<text><![CDATA[Payment Aging Balance]]></text>
 			</staticText>
 			<image isLazy="true">
-				<reportElement key="image-1" x="321" y="10" width="197" height="55"/>
+				<reportElement key="image-1" x="321" y="10" width="197" height="55" uuid="3bf9ba50-fdda-4559-ac4a-e0d7df739b9c"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
-				<imageExpression class="java.awt.Image"><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylogin")]]></imageExpression>
+				<imageExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanylogin")]]></imageExpression>
 			</image>
 		</band>
 	</title>
@@ -135,7 +135,7 @@
 	<columnHeader>
 		<band height="15" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-18" style="Detail_Header" x="0" y="0" width="164" height="15"/>
+				<reportElement key="staticText-18" style="Detail_Header" x="0" y="0" width="164" height="15" uuid="9e02a09e-c0c6-4ae2-add2-34fd09b8a573"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -148,7 +148,7 @@
 				<text><![CDATA[BUSINESS PARTNER]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-19" style="Detail_Header" x="164" y="0" width="56" height="15"/>
+				<reportElement key="staticText-19" style="Detail_Header" x="164" y="0" width="56" height="15" uuid="d904e338-9ae2-407f-8beb-1db9b465fe0f"/>
 				<box leftPadding="5" rightPadding="4">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -161,7 +161,7 @@
 				<text><![CDATA[PREVIOUS]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-25" style="Detail_Header" x="463" y="0" width="50" height="15"/>
+				<reportElement key="staticText-25" style="Detail_Header" x="463" y="0" width="50" height="15" uuid="321f6916-21fe-4976-b34b-78cbe0cd416d"/>
 				<box leftPadding="5" rightPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -174,7 +174,7 @@
 				<text><![CDATA[TOTAL]]></text>
 			</staticText>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" style="Detail_Header" x="220" y="0" width="47" height="15"/>
+				<reportElement key="textField" style="Detail_Header" x="220" y="0" width="47" height="15" uuid="9cb21d47-4593-4eca-88a6-c8d16fac0149"/>
 				<box leftPadding="5" rightPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -184,10 +184,10 @@
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{col1}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{col1}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-3" style="Detail_Header" x="267" y="0" width="48" height="15"/>
+				<reportElement key="textField-3" style="Detail_Header" x="267" y="0" width="48" height="15" uuid="68aadfa3-a8c5-4a5f-a461-044f9b67b4c2"/>
 				<box leftPadding="5" rightPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -197,10 +197,10 @@
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{col2}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{col2}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-4" style="Detail_Header" x="315" y="0" width="50" height="15"/>
+				<reportElement key="textField-4" style="Detail_Header" x="315" y="0" width="50" height="15" uuid="b1912d19-e438-42b9-80b1-3673e0d3afe8"/>
 				<box leftPadding="5" rightPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -210,10 +210,10 @@
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{col3}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{col3}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-5" style="Detail_Header" x="365" y="0" width="48" height="15"/>
+				<reportElement key="textField-5" style="Detail_Header" x="365" y="0" width="48" height="15" uuid="4a9dbeb6-4e95-43d3-8756-67669f6106f8"/>
 				<box leftPadding="5" rightPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -223,10 +223,10 @@
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{col4}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{col4}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-6" style="Detail_Header" x="414" y="0" width="49" height="15"/>
+				<reportElement key="textField-6" style="Detail_Header" x="414" y="0" width="49" height="15" uuid="4f63b05f-e3c4-456d-997a-20512d151a2f"/>
 				<box leftPadding="5" rightPadding="2">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -236,26 +236,26 @@
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="8" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$P{col5}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$P{col5}]]></textFieldExpression>
 			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="16" splitType="Stretch">
 			<line>
-				<reportElement key="line-16" stretchType="RelativeToBandHeight" x="512" y="0" width="1" height="16"/>
+				<reportElement key="line-16" stretchType="RelativeToBandHeight" x="512" y="0" width="1" height="16" uuid="307b619b-e2a4-4505-88a7-10af4f8a9b0e"/>
 				<graphicElement>
 					<pen lineWidth="0.25" lineStyle="Solid"/>
 				</graphicElement>
 			</line>
 			<line>
-				<reportElement key="line-17" stretchType="RelativeToBandHeight" x="1" y="0" width="1" height="16"/>
+				<reportElement key="line-17" stretchType="RelativeToBandHeight" x="1" y="0" width="1" height="16" uuid="827d5490-13e5-45a8-b5f6-ce3381354b36"/>
 				<graphicElement>
 					<pen lineWidth="1.0" lineStyle="Solid"/>
 				</graphicElement>
 			</line>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" x="6" y="0" width="159" height="16"/>
+				<reportElement key="textField" x="6" y="0" width="159" height="16" uuid="a86c810e-5383-472f-ba75-8b94b841dbbd"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -265,10 +265,10 @@
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{BPARTNER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BPARTNER}]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" x="220" y="0" width="47" height="16"/>
+				<reportElement key="textField" x="220" y="0" width="47" height="16" uuid="19601cc2-2c45-4d5e-a9e1-70608ab7fc2a"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -278,10 +278,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{ONE}!=null)?$P{NUMBERFORMAT}.format($F{ONE}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{ONE}!=null)?$P{NUMBERFORMAT}.format($F{ONE}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" x="267" y="0" width="48" height="16"/>
+				<reportElement key="textField" x="267" y="0" width="48" height="16" uuid="58da08e0-cd67-45f8-87f2-6ac4c4472c16"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -291,10 +291,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{TWO}!=null)?$P{NUMBERFORMAT}.format($F{TWO}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{TWO}!=null)?$P{NUMBERFORMAT}.format($F{TWO}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" x="315" y="0" width="50" height="16"/>
+				<reportElement key="textField" x="315" y="0" width="50" height="16" uuid="0baeb604-3efe-4652-8bf5-33fa1bfdbb6d"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -304,10 +304,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{THREE}!=null)?$P{NUMBERFORMAT}.format($F{THREE}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{THREE}!=null)?$P{NUMBERFORMAT}.format($F{THREE}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" x="365" y="0" width="49" height="16"/>
+				<reportElement key="textField" x="365" y="0" width="49" height="16" uuid="63340e6c-ff8f-441e-92ba-fc876ec0bf49"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -317,10 +317,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{FOUR}!=null)?$P{NUMBERFORMAT}.format($F{FOUR}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{FOUR}!=null)?$P{NUMBERFORMAT}.format($F{FOUR}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" x="414" y="0" width="50" height="16"/>
+				<reportElement key="textField" x="414" y="0" width="50" height="16" uuid="d75820ab-a460-4905-83a5-77dce6eed154"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -330,10 +330,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{FIVE}!=null)?$P{NUMBERFORMAT}.format($F{FIVE}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{FIVE}!=null)?$P{NUMBERFORMAT}.format($F{FIVE}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" x="464" y="0" width="47" height="16"/>
+				<reportElement key="textField" x="464" y="0" width="47" height="16" uuid="0c29bc28-115a-422a-92ec-b590a64e85d7"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -343,10 +343,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{TOTAL}!=null)?$P{NUMBERFORMAT}.format($F{TOTAL}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{TOTAL}!=null)?$P{NUMBERFORMAT}.format($F{TOTAL}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" x="165" y="0" width="55" height="16"/>
+				<reportElement key="textField" x="165" y="0" width="55" height="16" uuid="561c1fc3-3a8d-4d87-a72c-4b90ab1cf767"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -356,7 +356,7 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{ZERO}!=null)?$P{NUMBERFORMAT}.format($F{ZERO}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{ZERO}!=null)?$P{NUMBERFORMAT}.format($F{ZERO}):new String(" ")]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
@@ -369,7 +369,7 @@
 	<summary>
 		<band height="30" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" style="Report_Footer" x="279" y="20" width="69" height="8"/>
+				<reportElement key="textField" style="Report_Footer" x="279" y="20" width="69" height="8" uuid="d28d977f-b365-4378-9364-337abc01c1c0"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -379,10 +379,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Times-Roman" size="5"/>
 				</textElement>
-				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[new Date()]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement key="staticText-1" style="Report_Footer" x="200" y="20" width="76" height="8"/>
+				<reportElement key="staticText-1" style="Report_Footer" x="200" y="20" width="76" height="8" uuid="89886912-58d2-4a4d-a6d4-9ddff2596b2f"/>
 				<box topPadding="2" leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -395,7 +395,7 @@
 				<text><![CDATA[Printed on]]></text>
 			</staticText>
 			<staticText>
-				<reportElement key="staticText-26" style="Detail_Header" x="1" y="0" width="164" height="14"/>
+				<reportElement key="staticText-26" style="Detail_Header" x="1" y="0" width="164" height="14" uuid="7d3331ac-5e47-475b-9c6a-4da5573e5d69"/>
 				<box leftPadding="5">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#FFFFFF"/>
@@ -408,7 +408,7 @@
 				<text><![CDATA[TOTAL:]]></text>
 			</staticText>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField-2" mode="Opaque" x="165" y="0" width="51" height="14" forecolor="#060D0A" backcolor="#CAB7B7"/>
+				<reportElement key="textField-2" mode="Opaque" x="165" y="0" width="51" height="14" forecolor="#060D0A" backcolor="#CAB7B7" uuid="e24b10ee-2ecf-40f0-979c-9952833e02ba"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -418,10 +418,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($V{SUM_ZERO_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_ZERO_1}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($V{SUM_ZERO_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_ZERO_1}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" mode="Opaque" x="216" y="0" width="51" height="14" forecolor="#060D0A" backcolor="#CAB7B7"/>
+				<reportElement key="textField" mode="Opaque" x="216" y="0" width="51" height="14" forecolor="#060D0A" backcolor="#CAB7B7" uuid="d52d73e7-df66-4a11-b781-51d89d03611b"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -431,10 +431,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($V{SUM_ONE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_ONE_1}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($V{SUM_ONE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_ONE_1}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" mode="Opaque" x="267" y="0" width="48" height="14" forecolor="#060D0A" backcolor="#CAB7B7"/>
+				<reportElement key="textField" mode="Opaque" x="267" y="0" width="48" height="14" forecolor="#060D0A" backcolor="#CAB7B7" uuid="072715e7-4a84-4726-b4ca-b256223f379c"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -444,10 +444,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($V{SUM_TWO_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_TWO_1}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($V{SUM_TWO_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_TWO_1}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" mode="Opaque" x="315" y="0" width="50" height="14" forecolor="#060D0A" backcolor="#CAB7B7"/>
+				<reportElement key="textField" mode="Opaque" x="315" y="0" width="50" height="14" forecolor="#060D0A" backcolor="#CAB7B7" uuid="115a7f76-121f-451c-8a25-b851acd0d7d6"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -457,10 +457,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($V{SUM_THREE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_THREE_1}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($V{SUM_THREE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_THREE_1}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" mode="Opaque" x="365" y="0" width="49" height="14" forecolor="#060D0A" backcolor="#CAB7B7"/>
+				<reportElement key="textField" mode="Opaque" x="365" y="0" width="49" height="14" forecolor="#060D0A" backcolor="#CAB7B7" uuid="89fb1f6c-d197-4077-9b14-083694c3057e"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -470,10 +470,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($V{SUM_FOUR_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_FOUR_1}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($V{SUM_FOUR_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_FOUR_1}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" mode="Opaque" x="414" y="0" width="50" height="14" forecolor="#060D0A" backcolor="#CAB7B7"/>
+				<reportElement key="textField" mode="Opaque" x="414" y="0" width="50" height="14" forecolor="#060D0A" backcolor="#CAB7B7" uuid="8a6b64dd-c17c-4c68-95df-0d2480e34dfc"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -483,10 +483,10 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($V{SUM_FIVE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_FIVE_1}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($V{SUM_FIVE_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_FIVE_1}):new String(" ")]]></textFieldExpression>
 			</textField>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" mode="Opaque" x="464" y="0" width="47" height="14" forecolor="#060D0A" backcolor="#CAB7B7"/>
+				<reportElement key="textField" mode="Opaque" x="464" y="0" width="47" height="14" forecolor="#060D0A" backcolor="#CAB7B7" uuid="ac2428a2-ab7e-4a4b-9e23-af25e618bda5"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -496,7 +496,7 @@
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($V{SUM_TOTAL_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_TOTAL_1}):new String(" ")]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($V{SUM_TOTAL_1}!=null)?$P{NUMBERFORMAT}.format($V{SUM_TOTAL_1}):new String(" ")]]></textFieldExpression>
 			</textField>
 		</band>
 	</summary>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportAnnualCertification" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportAnnualCertification" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="02325b36-2c8d-4de0-9ff2-59bb35427704">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<import value="net.sf.jasperreports.engine.*"/>
@@ -74,17 +74,17 @@
 	<title>
 		<band splitType="Stretch">
 			<line>
-				<reportElement key="line" x="0" y="-2" width="534" height="1"/>
+				<reportElement key="line" x="0" y="-2" width="534" height="1" uuid="fa2fbf64-d75d-4177-924e-b95eab716537"/>
 			</line>
 			<line>
-				<reportElement key="line" x="0" y="-47" width="534" height="1"/>
+				<reportElement key="line" x="0" y="-47" width="534" height="1" uuid="48634cb7-a4d7-41f9-9dc1-0973bf7e60f7"/>
 			</line>
 		</band>
 	</title>
 	<pageHeader>
 		<band height="10" splitType="Stretch">
 			<line direction="BottomUp">
-				<reportElement key="line" x="0" y="9" width="535" height="1"/>
+				<reportElement key="line" x="0" y="9" width="535" height="1" uuid="397a7976-964f-4a1d-b6e4-7b8e26a8eaf4"/>
 			</line>
 		</band>
 	</pageHeader>
@@ -94,7 +94,7 @@
 	<detail>
 		<band height="600" splitType="Stretch">
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" x="0" y="545" width="404" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="0" y="545" width="404" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="0c6c461a-5ae5-461a-a7c1-d6ac3a3d46b9"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -104,10 +104,10 @@
 				<textElement>
 					<font fontName="Courier New" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[($F{ADDRESSORGANIZATION}!=null)?$F{ADDRESSORGANIZATION}:new String(" ")+ " " + $P{DATEFORMATTER}.format(new Date())]]></textFieldExpression>
+				<textFieldExpression><![CDATA[($F{ADDRESSORGANIZATION}!=null)?$F{ADDRESSORGANIZATION}:new String(" ")+ " " + $P{DATEFORMATTER}.format(new Date())]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement key="textField" x="220" y="32" width="315" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="220" y="32" width="315" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="d0dd8e4d-c7ed-4f7b-ac23-69cb27d1cab8"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -117,10 +117,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{BUSINESSPARTNER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BUSINESSPARTNER}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement key="textField" x="76" y="170" width="196" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="76" y="170" width="196" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="c8b05ace-b7d9-4bd3-a7f4-54e56e9c96e4"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -130,10 +130,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{FISCALCODE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{FISCALCODE}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement key="textField" x="76" y="153" width="196" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="76" y="153" width="196" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="2bfc5c00-3325-421f-a241-437ee0245643"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -143,10 +143,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{ADDRESS1}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{ADDRESS1}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement key="textField" x="387" y="153" width="74" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="387" y="153" width="74" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="0ef95905-cb51-4cbe-a9e0-363f4d38d01e"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -156,10 +156,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{POSTAL}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{POSTAL}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement key="textField" x="277" y="153" width="107" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="277" y="153" width="107" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="9c9b019e-cea5-4573-b3e0-a311ad50b9a1"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -169,10 +169,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{CITY}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{CITY}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement key="textField" x="467" y="153" width="67" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="467" y="153" width="67" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="4fdabc2b-8dbc-4a95-8b4b-7fe2ce5089f8"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -182,10 +182,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{LOCODE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{LOCODE}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-6" x="0" y="69" width="535" height="33"/>
+				<reportElement key="textField-6" x="0" y="69" width="535" height="33" uuid="25c36fec-dfaa-4700-9378-76125d5f8760"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -195,10 +195,10 @@
 				<textElement>
 					<font fontName="Courier New" isBold="true" pdfFontName="Helvetica-Bold"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Subject: Certification of compensation subject to withholding"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Subject: Certification of compensation subject to withholding"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-7" x="1" y="117" width="75" height="18"/>
+				<reportElement key="textField-7" x="1" y="117" width="75" height="18" uuid="f7962023-7ee3-47d3-a96f-653370cfbdd5"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -208,10 +208,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Tax payer :"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Tax payer :"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-8" x="1" y="135" width="75" height="18"/>
+				<reportElement key="textField-8" x="1" y="135" width="75" height="18" uuid="c52366b0-4838-49eb-9fa8-2d1a63571943"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -221,10 +221,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Date of birth :"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Date of birth :"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-9" x="1" y="153" width="75" height="18"/>
+				<reportElement key="textField-9" x="1" y="153" width="75" height="18" uuid="b9d70a5e-751a-4389-acc9-651facf7f707"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -234,10 +234,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Address :"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Address :"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-10" x="1" y="171" width="75" height="18"/>
+				<reportElement key="textField-10" x="1" y="171" width="75" height="18" uuid="f5edd9c4-11b7-4bf9-94f3-82cd3c699861"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -247,10 +247,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Tax ID :"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Tax ID :"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-11" x="0" y="199" width="75" height="18"/>
+				<reportElement key="textField-11" x="0" y="199" width="75" height="18" uuid="23a8da65-9149-4e98-8093-11c7c77c08b0"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -260,10 +260,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Employer :"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Employer :"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-1" x="0" y="217" width="535" height="62"/>
+				<reportElement key="textField-1" x="0" y="217" width="535" height="62" uuid="3ac6d2e8-92bd-404d-a8c4-9e68b76a95ba"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -273,11 +273,11 @@
 				<textElement>
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["We certify that for the period from "+$P{DateFrom}.toString()+" to "+$P{DateTo}.toString()+" total payments to the payee were "+$F{GRANDTOTALAMOUNT}.toString()+
+				<textFieldExpression><![CDATA["We certify that for the period from "+$P{DateFrom}.toString()+" to "+$P{DateTo}.toString()+" total payments to the payee were "+$F{GRANDTOTALAMOUNT}.toString()+
 " and that the withholding amount is "+$F{WITHHOLDINGAMOUNT}.toString()]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-12" x="0" y="527" width="131" height="18"/>
+				<reportElement key="textField-12" x="0" y="527" width="131" height="18" uuid="c88084e3-e0f6-4a24-b699-1239adab2a33"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -287,10 +287,10 @@
 				<textElement>
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Best regards :"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Best regards :"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-13" x="404" y="557" width="131" height="18"/>
+				<reportElement key="textField-13" x="404" y="557" width="131" height="18" uuid="827b43a0-9b2a-43eb-8947-1a6bd0ebe85d"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -300,10 +300,10 @@
 				<textElement textAlignment="Right">
 					<font fontName="Courier New" isBold="false" pdfFontName="Helvetica"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Signature"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Signature"]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" x="0" y="9" width="109" height="12"/>
+				<reportElement key="textField" x="0" y="9" width="109" height="12" uuid="6bdcb39d-43b9-49f6-8aad-b3ee7ec711ea"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -313,21 +313,20 @@
 				<textElement>
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{MITTENTE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{MITTENTE}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" x="76" y="199" width="458" height="18"/>
+				<reportElement key="textField" x="76" y="199" width="458" height="18" uuid="58796205-08d4-4e7e-b225-02ee07f3972d"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<bottomPen lineWidth="0.0" lineColor="#000000"/>
 					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
-				<textElement/>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{EROGANTE}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{EROGANTE}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement key="textField-2" x="76" y="117" width="315" height="17" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField-2" x="76" y="117" width="315" height="17" forecolor="#000000" backcolor="#FFFFFF" uuid="8dc59fad-8ac0-4b06-8266-f0c53e7048ee"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -337,10 +336,10 @@
 				<textElement verticalAlignment="Middle">
 					<font fontName="Courier New" size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{BUSINESSPARTNER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{BUSINESSPARTNER}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-3" x="0" y="319" width="535" height="20"/>
+				<reportElement key="textField-3" x="0" y="319" width="535" height="20" uuid="563f4587-cfeb-4a8e-ab42-d9b075093928"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -350,10 +349,10 @@
 				<textElement>
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["On : "+ $P{DATEFORMATTER}.format($F{DATEPLANNED})]]></textFieldExpression>
+				<textFieldExpression><![CDATA["On : "+ $P{DATEFORMATTER}.format($F{DATEPLANNED})]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-4" x="0" y="279" width="535" height="20"/>
+				<reportElement key="textField-4" x="0" y="279" width="535" height="20" uuid="8535180c-5e15-4ad5-9428-d29b9305324b"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -363,10 +362,10 @@
 				<textElement>
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["The withhold amount has been deposited at: "]]></textFieldExpression>
+				<textFieldExpression><![CDATA["The withhold amount has been deposited at: "]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement key="textField-5" x="0" y="299" width="535" height="20"/>
+				<reportElement key="textField-5" x="0" y="299" width="535" height="20" uuid="e989ff64-f136-4c49-839e-ba73b88e44fb"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -376,7 +375,7 @@
 				<textElement>
 					<font fontName="Courier New"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{NAME}.trim()+"-"+$F{CODEBANK}.toString()+"-"+$F{CODEBRANCH}.toString()+"-"+$F{DIGITCONTROLBANK}.toString()+"-"+$F{DIGITCONTROLBANKACCOUNT}.toString()+"-"+$F{CODEACCOUNT}.toString()]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{NAME}.trim()+"-"+$F{CODEBANK}.toString()+"-"+$F{CODEBRANCH}.toString()+"-"+$F{DIGITCONTROLBANK}.toString()+"-"+$F{DIGITCONTROLBANKACCOUNT}.toString()+"-"+$F{CODEACCOUNT}.toString()]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
@@ -386,7 +385,7 @@
 	<pageFooter>
 		<band height="27" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" x="325" y="4" width="170" height="19" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="325" y="4" width="170" height="19" forecolor="#000000" backcolor="#FFFFFF" uuid="64a208ef-2f7c-4a81-b448-5d544eeafc8b"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -396,10 +395,10 @@
 				<textElement textAlignment="Right">
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+				<textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" x="499" y="4" width="36" height="19" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement key="textField" x="499" y="4" width="36" height="19" forecolor="#000000" backcolor="#FFFFFF" uuid="493f67e2-1fdb-41e9-b296-730e258f54a1"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -409,10 +408,10 @@
 				<textElement>
 					<font size="10"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+				<textFieldExpression><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line" x="0" y="3" width="535" height="1"/>
+				<reportElement key="line" x="0" y="3" width="535" height="1" uuid="a556713d-ebe1-4e10-b4bd-80a853425443"/>
 			</line>
 		</band>
 	</pageFooter>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAssetDepreciationSchedule.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAssetDepreciationSchedule.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="AssetsReportDepreciationSchedule" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="AssetsReportDepreciationSchedule" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="b16175b8-cd76-4fbc-b1fe-68ce5fa2a70f">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<import value="net.sf.jasperreports.engine.*"/>
@@ -21,13 +21,13 @@
 		<groupHeader>
 			<band height="38" splitType="Stretch">
 				<line>
-					<reportElement key="line-11" x="528" y="13" width="1" height="25"/>
+					<reportElement key="line-11" x="528" y="13" width="1" height="25" uuid="1284e16c-801f-4aba-9a42-7e54e130fd25"/>
 				</line>
 				<line>
-					<reportElement key="line-8" x="6" y="13" width="1" height="25"/>
+					<reportElement key="line-8" x="6" y="13" width="1" height="25" uuid="7e1c28fb-12da-433b-860f-b3f339c677d3"/>
 				</line>
 				<staticText>
-					<reportElement key="staticText-1" x="78" y="24" width="132" height="13"/>
+					<reportElement key="staticText-1" x="78" y="24" width="132" height="13" uuid="7882916b-ab24-4ad7-9220-cabd2ff1bbca"/>
 					<box topPadding="2" leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -40,7 +40,7 @@
 					<text><![CDATA[Amortization Start Date]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-2" x="209" y="24" width="128" height="13"/>
+					<reportElement key="staticText-2" x="209" y="24" width="128" height="13" uuid="afd0e0a1-87ef-4d91-8d6d-909f915cc8cd"/>
 					<box topPadding="2" leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -53,7 +53,7 @@
 					<text><![CDATA[Amortization End Date]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-3" x="337" y="24" width="126" height="13"/>
+					<reportElement key="staticText-3" x="337" y="24" width="126" height="13" uuid="7d83bcb2-06a3-415b-8c90-c72e24259c3e"/>
 					<box topPadding="2" leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -66,7 +66,7 @@
 					<text><![CDATA[Depreciation Amount]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-4" x="463" y="24" width="58" height="13"/>
+					<reportElement key="staticText-4" x="463" y="24" width="58" height="13" uuid="4bae6158-801b-4a84-a582-82212a6fb1a7"/>
 					<box topPadding="2" leftPadding="1" bottomPadding="1" rightPadding="1">
 						<topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -79,7 +79,7 @@
 					<text><![CDATA[Currency]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-7" x="15" y="24" width="63" height="13"/>
+					<reportElement key="staticText-7" x="15" y="24" width="63" height="13" uuid="e4b3cf4b-caaf-4bee-85ef-cb6d3fdb213a"/>
 					<box topPadding="2" leftPadding="2" rightPadding="2">
 						<topPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -92,10 +92,10 @@
 					<text><![CDATA[Fiscal Year]]></text>
 				</staticText>
 				<rectangle>
-					<reportElement key="rectangle-1" x="6" y="1" width="523" height="15" backcolor="#666666"/>
+					<reportElement key="rectangle-1" x="6" y="1" width="523" height="15" backcolor="#666666" uuid="1b3b99cc-da5d-4588-a7d5-707206849777"/>
 				</rectangle>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField" x="38" y="1" width="143" height="15" forecolor="#FFFFFF"/>
+					<reportElement key="textField" x="38" y="1" width="143" height="15" forecolor="#FFFFFF" uuid="3db90cce-3d65-41ba-a01a-1c70b4350a15"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -105,10 +105,10 @@
 					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="9" isBold="false" pdfFontName="Helvetica"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{assetName}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{assetName}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-8" x="9" y="1" width="30" height="15" forecolor="#FFFFFF"/>
+					<reportElement key="staticText-8" x="9" y="1" width="30" height="15" forecolor="#FFFFFF" uuid="0c6e0701-ce62-4443-83db-8331de40b649"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -121,7 +121,7 @@
 					<text><![CDATA[Asset :]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-9" x="213" y="1" width="78" height="15" forecolor="#FFFFFF"/>
+					<reportElement key="staticText-9" x="213" y="1" width="78" height="15" forecolor="#FFFFFF" uuid="837e448c-32ef-4806-b35c-d1ad8f3db3e2"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -134,7 +134,7 @@
 					<text><![CDATA[Asset Description :]]></text>
 				</staticText>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField" x="291" y="1" width="218" height="15" forecolor="#FFFFFF"/>
+					<reportElement key="textField" x="291" y="1" width="218" height="15" forecolor="#FFFFFF" uuid="a126653a-911b-465e-bc6f-d9d417774d4e"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -144,23 +144,23 @@
 					<textElement verticalAlignment="Middle">
 						<font size="9" isBold="false" pdfFontName="Helvetica"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{Assetdescription}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{Assetdescription}]]></textFieldExpression>
 				</textField>
 			</band>
 		</groupHeader>
 		<groupFooter>
 			<band height="27" splitType="Stretch">
 				<line>
-					<reportElement key="line-3" x="6" y="0" width="1" height="17"/>
+					<reportElement key="line-3" x="6" y="0" width="1" height="17" uuid="5ff63a9d-c902-4a32-bb23-69f770a52e40"/>
 				</line>
 				<line>
-					<reportElement key="line-4" x="7" y="16" width="521" height="1"/>
+					<reportElement key="line-4" x="7" y="16" width="521" height="1" uuid="33623776-ba6b-4369-9241-f74a26671b7c"/>
 				</line>
 				<line>
-					<reportElement key="line-5" x="528" y="0" width="1" height="17"/>
+					<reportElement key="line-5" x="528" y="0" width="1" height="17" uuid="125fc19c-560e-414e-961e-25f44dccff29"/>
 				</line>
 				<textField isBlankWhenNull="false">
-					<reportElement key="textField-1" x="373" y="0" width="120" height="12"/>
+					<reportElement key="textField-1" x="373" y="0" width="120" height="12" uuid="a4baeebb-f32a-4341-bd59-175c4621beed"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -170,10 +170,10 @@
 					<textElement verticalAlignment="Middle">
 						<font size="8" isBold="true" pdfFontName="Helvetica-Bold"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$V{TotalAmount}.toString()]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$V{TotalAmount}.toString()]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement key="staticText-10" x="15" y="0" width="105" height="12"/>
+					<reportElement key="staticText-10" x="15" y="0" width="105" height="12" uuid="a7a65ded-4c8c-4129-a8f5-37c053d8dea5"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -206,7 +206,7 @@
 	<pageHeader>
 		<band height="29" splitType="Stretch">
 			<staticText>
-				<reportElement key="staticText-6" x="6" y="0" width="521" height="25" forecolor="#000000"/>
+				<reportElement key="staticText-6" x="6" y="0" width="521" height="25" forecolor="#000000" uuid="312cd162-a222-46a1-86f3-c7383bf2b2e1"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -226,7 +226,7 @@
 	<detail>
 		<band height="14" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="false">
-				<reportElement key="textField" x="78" y="0" width="132" height="12"/>
+				<reportElement key="textField" x="78" y="0" width="132" height="12" uuid="539d76d9-7792-4b15-a8ff-bb7f4749008d"/>
 				<box leftPadding="1" rightPadding="1">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -236,10 +236,10 @@
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{startDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{startDate}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" x="209" y="0" width="128" height="12"/>
+				<reportElement key="textField" x="209" y="0" width="128" height="12" uuid="f2e93ac2-d54d-4a06-9e78-9ce5cded9ee4"/>
 				<box leftPadding="1" rightPadding="1">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -249,10 +249,10 @@
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{endDate}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{endDate}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" x="15" y="-1" width="63" height="13"/>
+				<reportElement key="textField" x="15" y="-1" width="63" height="13" uuid="5ff7ea61-fc32-4e4f-a846-d9832cc0027b"/>
 				<box leftPadding="1" rightPadding="1">
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -262,19 +262,19 @@
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{fieldFiscalYear}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{fieldFiscalYear}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement key="line-7" x="6" y="0" width="1" height="14"/>
+				<reportElement key="line-7" x="6" y="0" width="1" height="14" uuid="c61dc13b-a440-41b9-ab5f-88a9c4d64402"/>
 			</line>
 			<line>
-				<reportElement key="line-10" x="528" y="0" width="1" height="14"/>
+				<reportElement key="line-10" x="528" y="0" width="1" height="14" uuid="3790b90b-1267-4059-b12b-2352988d58be"/>
 			</line>
 			<line>
-				<reportElement key="line-13" x="15" y="11" width="506" height="2"/>
+				<reportElement key="line-13" x="15" y="11" width="506" height="2" uuid="b2ac2369-cf35-43a6-aa4d-8cd644acdc28"/>
 			</line>
 			<textField pattern="##0.00" isBlankWhenNull="false">
-				<reportElement key="textField" x="337" y="-1" width="126" height="12"/>
+				<reportElement key="textField" x="337" y="-1" width="126" height="12" uuid="4072121d-498f-4e59-a4d0-0f048b7430c8"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -284,10 +284,10 @@
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{amount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField" x="463" y="0" width="58" height="12"/>
+				<reportElement key="textField" x="463" y="0" width="58" height="12" uuid="3f497499-99ec-4417-8dbf-a88b20be0433"/>
 				<box>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
@@ -297,7 +297,7 @@
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{currency}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{currency}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml	Tue May 19 13:26:52 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml	Mon May 25 12:31:46 2015 +0200
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportBankJR" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportBankJR" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20" uuid="a9061d9b-450e-43bb-9cd4-faa46dcc3ae2">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
 	<import value="net.sf.jasperreports.engine.*"/>
@@ -118,7 +118,7 @@
 		<groupHeader>
 			<band height="50" splitType="Stretch">
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement key="textField" style="default" x="131" y="25" width="210" height="24"/>
+					<reportElement key="textField" style="default" x="131" y="25" width="210" height="24" uuid="7b0b8c73-3170-48d7-a882-b7619a38033f"/>
 					<box topPadding="2" leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -128,16 +128,16 @@
 					<textElement>
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{BANKACCOUNT}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{BANKACCOUNT}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement key="line-2" stretchType="RelativeToBandHeight" x="0" y="26" width="1" height="24" forecolor="#555555"/>
+					<reportElement key="line-2" stretchType="RelativeToBandHeight" x="0" y="26" width="1" height="24" forecolor="#555555" uuid="23fd7c29-b862-4a89-b178-e19114212dc6"/>
 				</line>
 				<line>
-					<reportElement key="line-3" stretchType="RelativeToBandHeight" x="533" y="25" width="1" height="25" forecolor="#555555"/>
+					<reportElement key="line-3" stretchType="RelativeToBandHeight" x="533" y="25" width="1" height="25" forecolor="#555555" uuid="3a654e4a-97ce-471c-b7f1-2010dde2cbef"/>
 				</line>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement key="textField" style="GroupHeader_DarkGray" x="0" y="0" width="535" height="25"/>
+					<reportElement key="textField" style="GroupHeader_DarkGray" x="0" y="0" width="535" height="25" uuid="5c010751-dc5e-4c82-9544-0b6d37717f98"/>
 					<box leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -147,10 +147,10 @@
 					<textElement verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="12"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{NAME}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{NAME}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-					<reportElement key="textField" style="default" x="440" y="25" width="91" height="24"/>
+					<reportElement key="textField" style="default" x="440" y="25" width="91" height="24" uuid="268324c8-c8e2-4426-a5f5-5048257f0415"/>
 					<box topPadding="2" leftPadding="5">
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -160,10 +160,10 @@
 					<textElement verticalAlignment="Middle">
 						<font fontName="Bitstream Vera Sans" size="10"/>
 					</textElement>
-					<textFieldExpression class="java.lang.String"><![CDATA[$F{CURRENCY}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{CURRENCY}]]></textFieldExpression>