[pool] nerge with pi
authorInigo Sanchez <inigo.sanchez@openbravo.com>
Wed, 17 Jun 2015 11:03:12 +0200
changeset 27287 2d71c9cb5f33
parent 27286 07ba2af69c58 (current diff)
parent 26941 8a8d0b47ec64 (diff)
child 27288 18048854c910
[pool] nerge with pi
.classpath.template
legal/Licensing.txt
lib/runtime/iText-2.1.7.jar
lib/runtime/jasperreports-4.0.1.jar
lib/runtime/jasperreports-fonts-4.0.1.jar
modules/org.openbravo.service.integration.google/src-db/database/model/functions/OBSEIG_UPDATE_ACCESS.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_EP_PROCEDURES.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MENU.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TREENODE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_MENU_PARAMETERS.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java
modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleIntegrationComponentProvider.java
modules/org.openbravo.service.integration.google/web/images/google.png
modules/org.openbravo.service.integration.google/web/org.openbravo.service.integration.google/js/obsegi-account-association-view.js
modules/org.openbravo.service.integration.openid/lib/runtime/guice-2.0.jar
modules/org.openbravo.service.integration.openid/lib/runtime/httpclient-4.0.jar
modules/org.openbravo.service.integration.openid/lib/runtime/httpcore-4.0.1.jar
modules/org.openbravo.service.integration.openid/lib/runtime/httpmime-4.1.jar
modules/org.openbravo.service.integration.openid/lib/runtime/openid4java-0.9.6.jar
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml
referencedata/sampledata/F_B_International_Group/AD_PINSTANCE_PARA.xml
src-db/database/lib/dbsourcemanager.jar
src/org/openbravo/dal/core/SessionHandler.java
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
src/org/openbravo/erpCommon/modules/ImportModule.java
src/org/openbravo/erpCommon/utility/Utility.java
--- a/.classpath.template	Wed Jun 03 17:51:06 2015 +0200
+++ b/.classpath.template	Wed Jun 17 11:03:12 2015 +0200
@@ -19,9 +19,6 @@
 	<classpathentry kind="src" path="modules/org.openbravo.userinterface.selector/src"/>
 	<classpathentry kind="src" path="modules/org.openbravo.userinterface.smartclient/src"/>
 	<classpathentry kind="src" path="modules/org.openbravo.service.datasource/src"/>
-	<classpathentry kind="src" path="modules/org.openbravo.service.integration.openid/src"/>
-	<classpathentry kind="src" path="modules/org.openbravo.service.integration.google/src"/>
-	<classpathentry kind="src" path="modules/org.openbravo.apachejdbcconnectionpool/src"/>
 	<classpathentry kind="src" path="modules/org.openbravo.utility.cleanup.log/src"/>
 	<classpathentry including="quartz.properties" kind="src" path="config"/>
 	<classpathentry kind="src" path="src-gen"/>
--- a/.hgsigs	Wed Jun 03 17:51:06 2015 +0200
+++ b/.hgsigs	Wed Jun 17 11:03:12 2015 +0200
@@ -168,4 +168,6 @@
 831f7c3e542951b324cd9880b198bb4751bfd251 0 iEYEABECAAYFAlTm9ToACgkQCX/oGf+2qkPpFgCgzIKSAc1CMJoGRySzaUNdjoiyXyUAn2N/WoGlO000oJ6LcEcBldIz3+iT
 295e0a259f619311101efee9f1d31aede5bdaa95 0 iEYEABECAAYFAlUZK3oACgkQCX/oGf+2qkOrywCdFORG9mDgA9SMY95tQrtMYtUftS0AoK6d8rFNeUz9xDvAP/y0B+2myvoN
 4d63b001f63758b1b79b9502621754878acdfdff 0 iEYEABECAAYFAlUwx7cACgkQCX/oGf+2qkOn2gCcCxKfDDCR1P8qYR9bNtxTIs81JY8AniiMcNvRgeOQ6DOF+jHHVksUM4eO
+ac3537eef819b48dc9888d5ab0d4fec470158bef 0 iEYEABECAAYFAlVbMyIACgkQCX/oGf+2qkPRzwCfYI94AYb2DYsvojxmVtqMVqKjGiQAoIfADynxGuktv9GHEwfJOnnLCxv3
 ac761ac78f576cee64046e115ac42d2a3b227682 0 iEYEABECAAYFAlVItlgACgkQCX/oGf+2qkPgSACeNz58xoUWpTvMywmncbWx7+r7bnUAn1Ba1al80Q9HMY/wiMNu1Vfpd9Jo
+fdb1e0cd936d09381ae1aa87be98cc4f0f334f31 0 iEYEABECAAYFAlVbM8QACgkQCX/oGf+2qkO+wACfTbKub/UT0e2V2iyIB21716NAn/oAoIHu7PYZ7w/BkTQDZWR0PXDdYkty
--- a/.hgtags	Wed Jun 03 17:51:06 2015 +0200
+++ b/.hgtags	Wed Jun 17 11:03:12 2015 +0200
@@ -179,4 +179,6 @@
 39f3bed2ed0eaa2a7e69a46d7bf417c346e25a6a 3.0PR15Q1.1
 31dfe7896f8fcd9390b979d7c6972f5aea00d199 3.0PR15Q1.2
 ad409516bfa0b1c6f7ab128cab4526dd5058c787 3.0PR15Q1.3
+d5ec99ff8e8e301cf4bf673f37b9c04ea1758f98 3.0PR15Q1.4
 4239774eb8de8f0740bfbd6e3e36c075ee2a5a91 3.0PR15Q2
+e861122b0b1d2aa2ca6e177bfbb9ddf939e33dd7 3.0PR15Q2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/Apache_poi_license.txt	Wed Jun 17 11:03:12 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	Wed Jun 03 17:51:06 2015 +0200
+++ b/legal/Licensing.txt	Wed Jun 17 11:03:12 2015 +0200
@@ -3,7 +3,7 @@
 This license file applies to the Openbravo ERP software (the "Openbravo
 Software"), except as described below.
 
-This product is Copyright 2001-2015 Openbravo S.L.U.  For other detailed notice,
+This product is Copyright 2001-2011 Openbravo S.L.U.  For other detailed notice,
 see the "NOTICE" file with this distribution.
 
 This product is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 src-core/src/org/openbravo/exception
 src-core/src/org/openbravo/utils
 src-core/src/org/openbravo/XmlEngine
-All these files are copyright © 2001-2015 Openbravo SLU
+All these files are copyright © 2001-2011 Openbravo SLU
 
 
 C) Third party code
@@ -123,7 +123,7 @@
 All files under Apache Software License 2.0, available at
 http://www.apache.org/licenses/LICENSE-2.0
 
-# postgresql-9.4-1201.jdbc4.jar
+# postgresql-9.0-801.jdbc4.jar
 Under the BSD license, also available at http://jdbc.postgresql.org/license.html  
 
 # xstream-1.3.1.jar
@@ -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)
@@ -235,9 +247,6 @@
 # httpclient-4.0.jar
 # httpmime-4.1.jar
 # guice-2.0.jar
-# openid4java-0.9.6.jar
-# tomcat-juli.jar
-# tomcat-jdbc.jar
 Under the Apache 2.0 license (included as Apache_license-2.0.txt in this folder)
 
 # jslint4java-1.4.7.jar
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/iTextpdf_license.txt	Wed Jun 17 11:03:12 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-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -904,7 +904,7 @@
                   END IF;
                 END IF;
                 
-                  IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN
+                IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN
                   UPDATE FIN_PAYMENT_SCHEDULE
                   SET PAIDAMT = (SELECT COALESCE(sum(amount + COALESCE(writeoffamt, 0)), 0)
                                  FROM fin_payment_scheduledetail
@@ -919,13 +919,7 @@
                       OUTSTANDINGAMT = (SELECT COALESCE(sum(amount), 0)
                                         FROM fin_payment_scheduledetail
                                         WHERE fin_payment_schedule_order=cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER AND
-                                              (fin_payment_detail_id is null OR
-                                       exists (SELECT 1
-                                               FROM fin_payment, fin_payment_detail
-                                               WHERE fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id
-                                                      and fin_payment.processed='Y' 
-                                                      and fin_payment_scheduledetail.isinvoicepaid='Y'
-                                                      and fin_payment_detail.fin_payment_detail_id = fin_payment_scheduledetail.fin_payment_detail_id)))
+                                        (fin_payment_detail_id is null OR isinvoicepaid='N'))
 
                   WHERE FIN_PAYMENT_SCHEDULE_ID = cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER;
                 END IF;
@@ -936,16 +930,15 @@
               UPDATE FIN_PAYMENT SET DESCRIPTION = v_finpayment_desc
                 WHERE FIN_PAYMENT_ID = v_FIN_PAYMENT_ID;
 
-              FOR cur_invoicepaid IN (
-                select isinvoicepaid from fin_payment_scheduledetail fpsd
-               left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
-               left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
-               left join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice
-                 WHERE ps.c_invoice_id =p_record_id
-              )
-             LOOP
+	      SELECT count(*) INTO v_count
+	      FROM fin_payment_schedule fps
+	      WHERE exists(select 1
+			   from fin_payment_scheduledetail fpsd
+		           where fps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice
+		           and fpsd.isinvoicepaid='N')
+              AND FIN_PAYMENT_SCHEDULE_ID = cur_paymentschedule.FIN_PAYMENT_SCHEDULE_ID;
 
-              IF ((cur_finaccpaymentmethod.ExecutionType<>'A') AND (cur_invoicepaid.isinvoicepaid='Y')) THEN 
+              IF (cur_finaccpaymentmethod.ExecutionType<>'A' AND v_count = 0) THEN
                 UPDATE FIN_PAYMENT_SCHEDULE
                 SET PAIDAMT = PAIDAMT + COALESCE(cur_paymentschedule.OUTSTANDINGAMT,0),
                     OUTSTANDINGAMT = OUTSTANDINGAMT - COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0)
@@ -994,7 +987,6 @@
                 SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount
                 WHERE C_BPARTNER_ID = v_BPartner_ID;
               END IF;
-            END LOOP;
               -- Automatic creation of financial transaction
               IF(cur_finaccpaymentmethod.CreateFinTransaction = 'Y' AND cur_finaccpaymentmethod.ExecutionType = 'M') THEN
                 v_ResultStr:='Generating FIN_FINACC_TRANSACTION';
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION APRM_SEQNOINVPAIDSTATUS">
+    <function name="APRM_SEQNOINVPAIDSTATUS" type="VARCHAR">
+      <parameter name="p_paymentmethod_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_financialaccount_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_isreceipt" type="CHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* 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) 2015 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  v_invoicepaidstatus fin_finacc_paymentmethod.payin_invoicepaidstatus%TYPE;
+
+BEGIN
+
+  SELECT CASE p_isReceipt WHEN 'Y' THEN payin_invoicepaidstatus
+       ELSE payout_invoicepaidstatus END AS invoicepaidstatus
+  INTO v_invoicepaidstatus
+  FROM fin_finacc_paymentmethod
+  WHERE fin_financial_account_id = p_financialaccount_id
+  and fin_paymentmethod_id = p_paymentmethod_id;
+
+  RETURN aprm_seqnumberpaymentstatus(v_invoicepaidstatus);
+
+EXCEPTION
+WHEN OTHERS THEN
+  DBMS_OUTPUT.PUT_LINE('aprm_seqnumberinvoicepaidstatus exception');
+  RAISE;
+END APRM_SEQNOINVPAIDSTATUS
+]]></body>
+    </function>
+  </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.26647]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.26933]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.26647]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.26647]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -655,7 +655,7 @@
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--C095D2CC39704DBE8B906B7CD7710968-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
+<!--C095D2CC39704DBE8B906B7CD7710968-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <HQLORDERBYCLAUSE><![CDATA[-transactionDate]]></HQLORDERBYCLAUSE>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
 <!--C095D2CC39704DBE8B906B7CD7710968-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
@@ -1059,7 +1059,7 @@
 <!--FF8080812F213146012F2135BC25000E-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--FF8080812F213146012F2135BC25000E-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--FF8080812F213146012F2135BC25000E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FF8080812F213146012F2135BC25000E-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
+<!--FF8080812F213146012F2135BC25000E-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--FF8080812F213146012F2135BC25000E-->  <HQLFILTERCLAUSE><![CDATA[e.reconciled = false]]></HQLFILTERCLAUSE>
 <!--FF8080812F213146012F2135BC25000E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--FF8080812F213146012F2135BC25000E-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -115,7 +115,8 @@
 from FIN_Payment f 
 @joinClause@ 
 where f.generatedCredit != '0' 
-and f.generatedCredit != f.usedCredit
+and f.generatedCredit != f.usedCredit 
+and aprm_seqnumberpaymentstatus(f.status) >= aprm_seqnoinvpaidstatus(f.paymentMethod, f.account, f.receipt) 
 @whereClause@ 
 and @additional_filters@ 
 and @insertion_point_0@ ]]></HQLQUERY>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -115,7 +115,7 @@
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <COLUMNNAME><![CDATA[converted_amount]]></COLUMNNAME>
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
-<!--0E081905DD9646A2AFB296F81C1AA62E-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0E081905DD9646A2AFB296F81C1AA62E-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <DEFAULTVALUE><![CDATA[OB.getFilterExpression("org.openbravo.advpaymentmngt.filterexpression.AddPaymentDefaultValuesExpression")]]></DEFAULTVALUE>
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <AD_ELEMENT_ID><![CDATA[80FC8B411CC1476693BBC697E5AA0913]]></AD_ELEMENT_ID>
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <ISFIXED><![CDATA[N]]></ISFIXED>
@@ -349,7 +349,7 @@
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <COLUMNNAME><![CDATA[conversion_rate]]></COLUMNNAME>
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
-<!--200C902859B746D5BDDC773D0C91C1BB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--200C902859B746D5BDDC773D0C91C1BB-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <DEFAULTVALUE><![CDATA[OB.getFilterExpression("org.openbravo.advpaymentmngt.filterexpression.AddPaymentDefaultValuesExpression")]]></DEFAULTVALUE>
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <AD_ELEMENT_ID><![CDATA[DF96F3B1C94743F9BEFA1555FBD2BB23]]></AD_ELEMENT_ID>
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <ISFIXED><![CDATA[N]]></ISFIXED>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -19,6 +19,7 @@
 package org.openbravo.advpaymentmngt.actionHandler;
 
 import java.math.BigDecimal;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -239,7 +240,8 @@
 
   private FIN_Payment createNewPayment(JSONObject jsonparams, boolean isReceipt, Organization org,
       BusinessPartner bPartner, Date paymentDate, Currency currency, BigDecimal conversionRate,
-      BigDecimal convertedAmt, String strActualPayment) throws OBException, JSONException {
+      BigDecimal convertedAmt, String strActualPayment) throws OBException, JSONException,
+      SQLException {
 
     String strPaymentDocumentNo = jsonparams.getString("payment_documentno");
     String strReferenceNo = "";
@@ -290,6 +292,7 @@
     FIN_Payment payment = (new AdvPaymentMngtDao()).getNewPayment(isReceipt, org, documentType,
         strPaymentDocumentNo, bPartner, paymentMethod, finAccount, strPaymentAmount, paymentDate,
         strReferenceNo, currency, conversionRate, convertedAmt);
+    OBDal.getInstance().getConnection(true).commit();
     return payment;
   }
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -27,12 +27,8 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.model.ad.domain.Preference;
 import org.openbravo.model.common.enterprise.Organization;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class MatchStatementOnLoadPreferenceActionHandler extends BaseActionHandler {
-  private static final Logger log = LoggerFactory
-      .getLogger(MatchStatementOnLoadPreferenceActionHandler.class);
 
   @Override
   protected JSONObject execute(Map<String, Object> parameters, String content) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -494,6 +494,9 @@
   private List<JSONObject> getNewRows(JSONArray gridRows) throws JSONException {
     List<JSONObject> lResult = new ArrayList<JSONObject>();
     for (int ind = 0; ind < gridRows.length(); ind++) {
+      if (!gridRows.getJSONObject(ind).has("id")) {
+        gridRows.getJSONObject(ind).put("id", "");
+      }
       String id = gridRows.getJSONObject(ind).getString("id");
       if (StringUtils.isEmpty(id) || id.equals("NEW")) {
         lResult.add(gridRows.getJSONObject(ind));
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java	Wed Jun 17 11:03:12 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) 2014 Openbravo SLU
+ * All portions are Copyright (C) 2014-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -86,7 +86,8 @@
           if (convRate != null) {
             result.put("conversionrate", convRate.getMultipleRateBy());
           } else {
-            result.put("conversionrate", 1);
+            result.put("conversionrate", "");
+            result.put("convertedamount", "");
           }
         }
         result.put("currencyToId", finAccPaymentMethod.getAccount().getCurrency().getId());
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java	Wed Jun 17 11:03:12 2015 +0200
@@ -30,9 +30,7 @@
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.provider.OBProvider;
-import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.client.application.process.BaseProcessActionHandler;
-import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBDao;
@@ -49,7 +47,6 @@
   protected JSONObject doExecute(Map<String, Object> parameters, String content) {
     JSONObject jsonRequest = null;
     OBContext.setAdminMode();
-    VariablesSecureApp vars = RequestContext.get().getVariablesSecureApp();
     try {
       jsonRequest = new JSONObject(content);
       log.debug(jsonRequest);
@@ -121,7 +118,7 @@
     int cont = 0;
     String differentPaymentMethod = "false";
     for (int i = 0; i < selectedLines.length(); i++) {
-      JSONObject selectedLine = selectedLines.getJSONObject((int) i);
+      JSONObject selectedLine = selectedLines.getJSONObject(i);
       log.debug(selectedLine);
       BigDecimal paidAmount = new BigDecimal(selectedLine.getString("payment"));
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ReceivedFromPaymentMethodActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ReceivedFromPaymentMethodActionHandler.java	Wed Jun 17 11:03:12 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) 2014 Openbravo SLU
+ * All portions are Copyright (C) 2014-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -48,7 +48,8 @@
           BusinessPartner businessPartner = OBDal.getInstance().get(BusinessPartner.class,
               receivedFrom);
           if (jsonData.getString("isSOTrx").toString().equals("true")) {
-            paymentMethod = businessPartner.getPaymentMethod().getId();
+            paymentMethod = businessPartner.getPaymentMethod() != null ? businessPartner
+                .getPaymentMethod().getId() : "";
           } else {
             paymentMethod = businessPartner.getPOPaymentMethod() != null ? businessPartner
                 .getPOPaymentMethod().getId() : "";
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Wed Jun 17 11:03:12 2015 +0200
@@ -833,8 +833,8 @@
    * 
    * @param vars
    *          VariablseSecureApp with the session data.
-   * @param selectedPaymentScheduleDetails
-   *          List of FIN_PaymentScheduleDetails that need to be included in the HashMap.
+   * @param _strSelectedScheduledPaymentDetailIds
+   *          List of id's of FIN_PaymentScheduleDetails that need to be included in the HashMap.
    * @return A HashMap mapping the FIN_PaymentScheduleDetail's Id with the corresponding amount.
    */
   private HashMap<String, BigDecimal> getSelectedPaymentDetailsAndAmount(VariablesSecureApp vars,
@@ -876,7 +876,6 @@
    *          : amount to split among the set
    * @param psdSet
    *          : set of payment schedule details where to allocate the amount
-   * @return
    */
   private HashMap<String, BigDecimal> calculateAmounts(BigDecimal recordAmount, Set<String> psdSet) {
     BigDecimal remainingAmount = recordAmount;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java	Wed Jun 17 11:03:12 2015 +0200
@@ -141,8 +141,8 @@
             strSelectedTransId);
         String newStatus = "RPPC";
         if (!isChecked) {
-          newStatus = (trans.getPaymentAmount().compareTo(trans.getDepositAmount()) >= 0) ? "RDNC"
-              : "PWNC";
+          newStatus = (trans.getPaymentAmount().compareTo(trans.getDepositAmount()) >= 0) ? "PWNC"
+              : "RDNC";
           trans.setReconciliation(null);
           if (trans.getFinPayment() != null) {
             trans.getFinPayment().setStatus((trans.getFinPayment().isReceipt()) ? "RDNC" : "PWNC");
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingDeposit.jrxml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingDeposit.jrxml	Wed Jun 17 11:03:12 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	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/OutstandingPayment.jrxml	Wed Jun 17 11:03:12 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	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java	Wed Jun 17 11:03:12 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	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml	Wed Jun 17 11:03:12 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	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/UnreconciledBankStatement.jrxml	Wed Jun 17 11:03:12 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java	Wed Jun 17 11:03:12 2015 +0200
@@ -131,6 +131,7 @@
         newTransaction.setForeignConversionRate(payment.getFinancialTransactionConvertRate());
         newTransaction.setForeignAmount(payment.getAmount());
       }
+      payment.getFINFinaccTransactionList().add(newTransaction);
       OBDal.getInstance().save(newTransaction);
       OBDal.getInstance().flush();
     } finally {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java	Wed Jun 17 11:03:12 2015 +0200
@@ -33,12 +33,8 @@
 import org.openbravo.model.financialmgmt.gl.GLItem;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class FIN_FinaccTransactionEventListener extends EntityPersistenceEventObserver {
-  private static final Logger logger = LoggerFactory
-      .getLogger(FIN_FinaccTransactionEventListener.class);
 
   private static Entity[] entities = { ModelProvider.getInstance().getEntity(
       FIN_FinaccTransaction.ENTITY_NAME) };
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -83,7 +83,7 @@
     AddPaymentDefaultValuesHandler handler = getDefaultsHandler(strWindowId);
     String paymentMethodId = handler.getDefaultPaymentMethod(requestMap);
     if (context.has("inpfinPaymentId") && context.get("inpfinPaymentId") != JSONObject.NULL
-        && StringUtils.isNotBlank((String) context.getString("inpfinPaymentId"))) {
+        && StringUtils.isNotBlank(context.getString("inpfinPaymentId"))) {
       if (hasDetailsWithDifferentPaymentMethods((String) context.get("inpfinPaymentId"))) {
         return "";
       } else {
@@ -111,7 +111,7 @@
     query.setParameter("paymentId", paymentId);
     FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class, paymentId);
     for (Object pmId : query.list()) {
-      if (!payment.getPaymentMethod().getId().equals((String) pmId)) {
+      if (!payment.getPaymentMethod().getId().equals(pmId)) {
         return true;
       }
     }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentSelectorFilterExpression.java	Wed Jun 17 11:03:12 2015 +0200
@@ -21,26 +21,16 @@
 
 import java.util.Map;
 
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
 import org.openbravo.client.application.FilterExpression;
-import org.openbravo.client.application.OBBindingsConstants;
-import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 
 public class PaymentSelectorFilterExpression implements FilterExpression {
-  private Logger log = Logger.getLogger(PaymentSelectorFilterExpression.class);
   private Map<String, String> requestMap;
-  private HttpSession httpSession;
-  private String windowId;
 
   @Override
   public String getExpression(Map<String, String> _requestMap) {
     requestMap = _requestMap;
-    httpSession = RequestContext.get().getSession();
-    windowId = requestMap.get(OBBindingsConstants.WINDOW_ID_PARAM);
 
     if (requestMap.containsKey("inpfinFinancialAccountId")) {
       FIN_FinancialAccount financialaccount = OBDal.getInstance().get(FIN_FinancialAccount.class,
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java	Wed Jun 17 11:03:12 2015 +0200
@@ -329,10 +329,6 @@
 
   /**
    * Order by selectedPSDs, scheduled date and document number
-   * 
-   * @param selectedPSDs
-   * @param transactionType
-   * @return
    */
   protected StringBuffer getOrderByClause(String transactionType, List<String> selectedPSDs,
       Map<String, String> requestParameters) {
@@ -391,13 +387,6 @@
     return hqlQuery;
   }
 
-  /**
-   * @param _hqlQuery
-   * @param transactionType
-   * @param criteria
-   * @param queryNamedParameters
-   * @return
-   */
   protected String calculateHavingClause(String _hqlQuery, String transactionType,
       JSONObject criteria, Map<String, Object> queryNamedParameters) {
     String hqlQuery = _hqlQuery;
@@ -527,13 +516,6 @@
     return hqlQuery;
   }
 
-  /**
-   * @param _hqlQuery
-   * @param transactionType
-   * @param selectedPSDs
-   * @param orderByClause
-   * @return
-   */
   protected String appendOrderByClause(String _hqlQuery, StringBuffer orderByClause,
       boolean justCount) {
     String hqlQuery = _hqlQuery;
@@ -570,10 +552,6 @@
     buildCriteria.put("criteria", newCriteriaArray);
   }
 
-  /**
-   * @param expression
-   * @return
-   */
   protected String getAggregatorFunction(String expression) {
     return " hqlagg(" + expression + ")";
   }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java	Wed Jun 17 11:03:12 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) 2014 Openbravo SLU
+ * All portions are Copyright (C) 2014-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -43,5 +43,4 @@
       Map<String, Object> queryNamedParameters) {
     return " ";
   }
-
 }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Wed Jun 17 11:03:12 2015 +0200
@@ -1276,9 +1276,6 @@
 
   /**
    * Returns the date in which last payment for this invoice took place
-   * 
-   * @param invoice
-   * @return
    */
   private static Date getFinalSettlementDate(Invoice invoice) {
     final OBCriteria<FIN_PaymentSchedInvV> obc = OBDal.getInstance().createCriteria(
@@ -1526,7 +1523,7 @@
    *          Payment Schedule Detail amount.
    * @param paymentAmount
    *          Amount selected to be collected. Always less or equal than scheduleDetailAmount.
-   * @param doubtfulDebtAmount
+   * @param doubtfulDebtTotalAmount
    *          Payment Schedule Detail doubtFulDebt amount.
    * @return resultant doubtful debt amount. Zero if no doubtful debt amount was present.
    */
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java	Wed Jun 17 11:03:12 2015 +0200
@@ -42,7 +42,7 @@
       final VariablesSecureApp vars = bundle.getContext().toVars();
       final ConnectionProvider conProvider = bundle.getConnection();
       final String language = bundle.getContext().getLanguage();
-      final boolean isForceProcess = (Boolean) "2DDE7D3618034C38A4462B7F3456C28D".equals(bundle
+      final boolean isForceProcess = "2DDE7D3618034C38A4462B7F3456C28D".equals(bundle
           .getProcessId());
 
       bankStatement.setProcessNow(true);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Wed Jun 17 11:03:12 2015 +0200
@@ -191,9 +191,6 @@
 
   /**
    * Returns the date in which last payment for this invoice took place
-   * 
-   * @param invoice
-   * @return
    */
   private static Date getFinalSettlementDate(Invoice invoice) {
     final OBCriteria<FIN_PaymentSchedInvV> obc = OBDal.getInstance().createCriteria(
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Wed Jun 17 11:03:12 2015 +0200
@@ -21,6 +21,8 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -155,14 +157,14 @@
         }
       }
 
-      OBDal.getInstance().flush();
       if (strAction.equals("P") || strAction.equals("D")) {
         // Guess if this is a refund payment
         boolean isRefund = false;
         OBContext.setAdminMode(false);
         try {
-          if (payment.getFINPaymentDetailList().size() > 0) {
-            for (FIN_PaymentDetail det : payment.getFINPaymentDetailList()) {
+          List<FIN_PaymentDetail> paymentDetailList = payment.getFINPaymentDetailList();
+          if (paymentDetailList.size() > 0) {
+            for (FIN_PaymentDetail det : paymentDetailList) {
               if (det.isRefund()) {
                 isRefund = true;
                 break;
@@ -178,13 +180,14 @@
           OBDal.getInstance().save(payment);
         }
 
-        boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(FIN_Payment.TABLE_NAME,
-            payment.getId(), FIN_Payment.TABLE_NAME + "_ID", "LE");
         boolean documentEnabled = getDocumentConfirmation(null, payment.getId());
-        if (documentEnabled
+        boolean periodNotAvailable = documentEnabled
             && !FIN_Utility.isPeriodOpen(payment.getClient().getId(), payment.getDocumentType()
                 .getDocumentCategory(), payment.getOrganization().getId(), OBDateUtils
-                .formatDate(payment.getPaymentDate())) && orgLegalWithAccounting) {
+                .formatDate(payment.getPaymentDate()))
+            && FIN_Utility.periodControlOpened(FIN_Payment.TABLE_NAME, payment.getId(),
+                FIN_Payment.TABLE_NAME + "_ID", "LE");
+        if (periodNotAvailable) {
           msg = OBMessageUtils.messageBD("PeriodNotAvailable");
           throw new OBException(msg);
         }
@@ -204,6 +207,7 @@
         // FIXME: added to access the FIN_PaymentSchedule and FIN_PaymentScheduleDetail tables to be
         // removed when new security implementation is done
         OBContext.setAdminMode();
+        boolean flushDone = false;
         try {
           String strRefundCredit = "";
           // update payment schedule amount
@@ -313,8 +317,9 @@
             }
           }
           // Execution Process
-          if (dao.isAutomatedExecutionPayment(payment.getAccount(), payment.getPaymentMethod(),
-              payment.isReceipt())) {
+          if (!isPosOrder
+              && dao.isAutomatedExecutionPayment(payment.getAccount(), payment.getPaymentMethod(),
+                  payment.isReceipt())) {
             try {
               payment.setStatus("RPAE");
 
@@ -359,16 +364,26 @@
                 decreaseCustomerCredit(businessPartner, payment.getUsedCredit());
               }
             }
+
             for (FIN_PaymentDetail paymentDetail : payment.getFINPaymentDetailList()) {
+
+              List<FIN_PaymentScheduleDetail> orderPaymentScheduleDetails = new ArrayList<FIN_PaymentScheduleDetail>(
+                  paymentDetail.getFINPaymentScheduleDetailList());
+
               // Get payment schedule detail list ordered by amount asc.
               // First negative if they exist and then positives
-              OBCriteria<FIN_PaymentScheduleDetail> obcPSD = OBDal.getInstance().createCriteria(
-                  FIN_PaymentScheduleDetail.class);
-              obcPSD.add(Restrictions.eq(FIN_PaymentScheduleDetail.PROPERTY_PAYMENTDETAILS,
-                  paymentDetail));
-              obcPSD.addOrderBy(FIN_PaymentScheduleDetail.PROPERTY_AMOUNT, true);
+              if (orderPaymentScheduleDetails.size() > 1) {
+                Collections.sort(orderPaymentScheduleDetails,
+                    new Comparator<FIN_PaymentScheduleDetail>() {
+                      @Override
+                      public int compare(FIN_PaymentScheduleDetail o1, FIN_PaymentScheduleDetail o2) {
+                        // TODO Auto-generated method stub
+                        return o1.getAmount().compareTo(o2.getAmount());
+                      }
+                    });
+              }
 
-              for (FIN_PaymentScheduleDetail paymentScheduleDetail : obcPSD.list()) {
+              for (FIN_PaymentScheduleDetail paymentScheduleDetail : orderPaymentScheduleDetails) {
                 BigDecimal amount = paymentScheduleDetail.getAmount().add(
                     paymentScheduleDetail.getWriteoffAmount());
                 // Do not restore paid amounts if the payment is awaiting execution.
@@ -377,8 +392,11 @@
                     .invoicePaymentStatus(payment)));
                 paymentScheduleDetail.setInvoicePaid(false);
                 // Payment = 0 when the payment is generated by a invoice that consume credit
-                if (invoicePaidAmounts
-                    | (payment.getAmount().compareTo(new BigDecimal("0.00")) == 0)) {
+                if ((invoicePaidAmounts && paymentScheduleDetail.getInvoicePaymentSchedule() != null)
+                    || (paymentScheduleDetail.getOrderPaymentSchedule() != null)
+                    || (paymentScheduleDetail.getInvoicePaymentSchedule() == null && paymentScheduleDetail
+                        .getOrderPaymentSchedule() == null)
+                    || (payment.getAmount().compareTo(new BigDecimal("0.00")) == 0)) {
                   if (paymentScheduleDetail.getInvoicePaymentSchedule() != null) {
                     // BP SO_CreditUsed
                     businessPartner = paymentScheduleDetail.getInvoicePaymentSchedule()
@@ -458,14 +476,18 @@
                 && payment.getAmount().compareTo(BigDecimal.ZERO) != 0
                 && !"TRANSACTION".equals(comingFrom)) {
               triggerAutomaticFinancialAccountTransaction(payment);
+              flushDone = true;
             }
           }
           if (!payment.getAccount().getCurrency().equals(payment.getCurrency())
               && getConversionRateDocument(payment).size() == 0) {
             insertConversionRateDocument(payment);
+            flushDone = true;
           }
         } finally {
-          OBDal.getInstance().flush();
+          if (!flushDone) {
+            OBDal.getInstance().flush();
+          }
           OBContext.restorePreviousMode();
         }
 
@@ -1320,14 +1342,8 @@
     OBContext.setAdminMode();
     try {
       FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class, strRecordId);
-      OBCriteria<FinAccPaymentMethod> obCriteria = OBDal.getInstance().createCriteria(
-          FinAccPaymentMethod.class);
-      obCriteria.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, payment.getAccount()));
-      obCriteria.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD,
-          payment.getPaymentMethod()));
-      obCriteria.setFilterOnReadableClients(false);
-      obCriteria.setFilterOnReadableOrganization(false);
-      List<FinAccPaymentMethod> lines = obCriteria.list();
+      List<FinAccPaymentMethod> lines = payment.getPaymentMethod()
+          .getFinancialMgmtFinAccPaymentMethodList();
       List<FIN_FinancialAccountAccounting> accounts = payment.getAccount()
           .getFINFinancialAccountAcctList();
       for (FIN_FinancialAccountAccounting account : accounts) {
@@ -1360,6 +1376,7 @@
         }
       }
     } catch (Exception e) {
+      // TODO no logging... ??
       return confirmation;
     } finally {
       OBContext.restorePreviousMode();
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java	Wed Jun 17 11:03:12 2015 +0200
@@ -111,7 +111,7 @@
           bundle.setResult(msg);
           return;
         }
-        final boolean isForceProcess = (Boolean) "6BF16EFC772843AC9A17552AE0B26AB7".equals(bundle
+        final boolean isForceProcess = "6BF16EFC772843AC9A17552AE0B26AB7".equals(bundle
             .getProcessId());
         // Transaction exists
         if (!isForceProcess && !MatchTransactionDao.islastreconciliation(reconciliation)) {
@@ -158,7 +158,6 @@
         reconciliation.setAPRMProcessReconciliationForce("P");
         OBDal.getInstance().save(reconciliation);
         OBDal.getInstance().flush();
-        Boolean invoicePaidold = false;
       }
       reconciliation.setProcessNow(false);
       OBDal.getInstance().save(reconciliation);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java	Wed Jun 17 11:03:12 2015 +0200
@@ -99,6 +99,7 @@
         // ***********************
         // Process Transaction
         // ***********************
+
         boolean orgLegalWithAccounting = FIN_Utility.periodControlOpened(
             FIN_FinaccTransaction.TABLE_NAME, transaction.getId(), FIN_FinaccTransaction.TABLE_NAME
                 + "_ID", "LE");
@@ -110,6 +111,7 @@
           msg = OBMessageUtils.messageBD("PeriodNotAvailable");
           throw new OBException(msg);
         }
+
         final FIN_FinancialAccount financialAccount = transaction.getAccount();
         financialAccount.setCurrentBalance(financialAccount.getCurrentBalance().add(
             transaction.getDepositAmount().subtract(transaction.getPaymentAmount())));
@@ -135,7 +137,8 @@
             for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
               invoicePaidold = psd.isInvoicePaid();
               if (!invoicePaidold) {
-                if ((FIN_Utility.invoicePaymentStatus(payment).equals(payment.getStatus()))) {
+                if (FIN_Utility.invoicePaymentStatus(payment).equals(payment.getStatus())
+                    && psd.getInvoicePaymentSchedule() != null) {
                   psd.setInvoicePaid(true);
                 }
                 if (psd.isInvoicePaid()) {
@@ -165,7 +168,6 @@
         transaction.setAprmProcessed("R");
         OBDal.getInstance().save(financialAccount);
         OBDal.getInstance().save(transaction);
-        OBDal.getInstance().flush();
 
       } else if (strAction.equals("R")) {
         // ***********************
@@ -196,10 +198,14 @@
               ConversionRateDoc.class);
           obc.add(Restrictions.eq(ConversionRateDoc.PROPERTY_FINANCIALACCOUNTTRANSACTION,
               transaction));
+          boolean dataRemoved = false;
           for (ConversionRateDoc conversionRateDoc : obc.list()) {
+            dataRemoved = true;
             OBDal.getInstance().remove(conversionRateDoc);
           }
-          OBDal.getInstance().flush();
+          if (dataRemoved) {
+            OBDal.getInstance().flush();
+          }
         } finally {
           OBContext.restorePreviousMode();
         }
@@ -209,7 +215,6 @@
             .subtract(transaction.getDepositAmount()).add(transaction.getPaymentAmount()));
         OBDal.getInstance().save(financialAccount);
         OBDal.getInstance().save(transaction);
-        OBDal.getInstance().flush();
         if (payment != null) {
           Boolean invoicePaidold = false;
           for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) {
@@ -233,9 +238,9 @@
         }
         transaction.setAprmProcessed("P");
         OBDal.getInstance().save(transaction);
-        OBDal.getInstance().flush();
       }
     } finally {
+      OBDal.getInstance().flush();
       OBContext.restorePreviousMode();
     }
   }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Wed Jun 17 11:03:12 2015 +0200
@@ -425,7 +425,7 @@
         if (!businessPartnersScroll.next()) {
           String strParnterId = "";
           if (resultObject.getClass().isArray()) {
-            final Object[] values = (Object[]) resultObject;
+            final Object[] values = resultObject;
             strParnterId = (String) values[0];
           }
           BusinessPartner bp = OBDal.getInstance().get(BusinessPartner.class, strParnterId);
@@ -454,7 +454,7 @@
 
       String targetBusinessPartnerName = "";
       if (resultObject.getClass().isArray()) {
-        final Object[] values = (Object[]) resultObject;
+        final Object[] values = resultObject;
         targetBusinessPartnerId = (String) values[0];
         targetBusinessPartnerName = (String) values[1];
       }
@@ -481,7 +481,7 @@
         String bpName = "";
         resultObject = (Object[]) businessPartners.get(0);
         if (resultObject.getClass().isArray()) {
-          final Object[] values = (Object[]) resultObject;
+          final Object[] values = resultObject;
           bpId = (String) values[0];
           bpName = (String) values[1];
         }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed Jun 17 11:03:12 2015 +0200
@@ -1059,7 +1059,7 @@
       invoiceDocNo = invoice.getDocumentNo();
 
       final String paymentDescription = OBDal.getInstance()
-          .get(OrganizationInformation.class, ((String) DalUtil.getId(organization)))
+          .get(OrganizationInformation.class, (DalUtil.getId(organization)))
           .getAPRMPaymentDescription();
       // In case of a purchase invoice and the Supplier Reference is selected use Reference
       if (paymentDescription.equals("Supplier Reference") && !invoice.isSalesTransaction()) {
@@ -1245,7 +1245,6 @@
 
   public static boolean periodControlOpened(String tableName, String recordId, String idColumnName,
       String orgType) {
-    final Session session = OBDal.getInstance().getSession();
 
     List<Object> parameters = new ArrayList<Object>();
     parameters.add(tableName);
@@ -1255,7 +1254,7 @@
     Object result = CallStoredProcedure.getInstance().call("ad_get_doc_le_bu", parameters, null,
         false, true);
 
-    Organization org = OBDal.getInstance().get(Organization.class, (String) result);
+    Organization org = OBDal.getInstance().get(Organization.class, result);
 
     return org.getOrganizationType().isLegalEntityWithAccounting();
   }
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js	Wed Jun 17 11:03:12 2015 +0200
@@ -182,8 +182,9 @@
       }
       form.getItem('c_currency_to_id').setValue(data.currencyToId);
       form.getItem('c_currency_to_id').valueMap[data.currencyToId] = data.currencyToIdentifier;
-      if (recalcConvRate && isc.isA.Number(data.conversionrate)) {
-        form.getItem('conversion_rate').setValue(Number(data.conversionrate));
+      if (recalcConvRate) {
+        form.getItem('conversion_rate').setValue(data.conversionrate);
+        form.getItem('converted_amount').setValue(data.convertedamount);
         OB.APRM.AddPayment.updateConvertedAmount(view, form, false);
       }
     }
@@ -853,8 +854,8 @@
 };
 
 OB.APRM.AddPayment.updateConvertedAmount = function (view, form, recalcExchangeRate) {
-  var exchangeRate = new BigDecimal(String(form.getItem('conversion_rate').getValue() || 1)),
-      actualConverted = new BigDecimal(String(form.getItem('converted_amount').getValue() || 0)),
+  var exchangeRate = form.getItem('conversion_rate').getValue(),
+      actualConverted = form.getItem('converted_amount').getValue(),
       actualPayment = new BigDecimal(String(form.getItem('actual_payment').getValue() || 0)),
       actualConvertedItem = form.getItem('converted_amount'),
       exchangeRateItem = form.getItem('conversion_rate'),
@@ -862,6 +863,12 @@
       newExchangeRate = BigDecimal.prototype.ONE,
       currencyPrecision = form.getItem('StdPrecision').getValue();
 
+  if (!actualConverted && !exchangeRate) {
+    return;
+  }
+
+  exchangeRate = new BigDecimal(String(exchangeRate || 1));
+  actualConverted = new BigDecimal(String(actualConverted || 0));
   if (!actualConverted || !exchangeRate) {
     return;
   }
@@ -872,7 +879,7 @@
         exchangeRateItem.setValue(Number(newExchangeRate.toString()));
       }
     } else {
-      exchangeRateItem.setValue(Number(newExchangeRate.toString));
+      exchangeRateItem.setValue(Number(newExchangeRate.toString()));
     }
   } else if (exchangeRate) {
     newConvertedAmount = actualPayment.multiply(exchangeRate).setScale(currencyPrecision, BigDecimal.prototype.ROUND_HALF_UP);
@@ -1130,12 +1137,12 @@
     return clientSideValidationFail();
   }
 
-  if ((total.compareTo(creditTotalItem) < 0) && (overpaymentField.isVisible() && overpaymentAction === 'CR')) {
+  if (creditTotalItem.compareTo(BigDecimal.prototype.ZERO) !== 0 && (total.compareTo(creditTotalItem) < 0) && (overpaymentField.isVisible() && overpaymentAction === 'CR')) {
     view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('APRM_MORECREDITAMOUNT'));
     return clientSideValidationFail();
   }
 
-  if (document !== null && document !== '' && actualPayment.compareTo(BigDecimal.prototype.ZERO) === 0 && view.parentWindow && view.parentWindow.windowId) {
+  if (document !== null && document !== '' && actualPayment.compareTo(BigDecimal.prototype.ZERO) === 0 && view.parentWindow && view.parentWindow.windowId && !overpaymentAction) {
     view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('APRM_ZEROAMOUNTPAYMENTTRANSACTION'));
     return clientSideValidationFail();
   }
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js	Wed Jun 17 11:03:12 2015 +0200
@@ -164,7 +164,7 @@
   returnObject.received = 0;
   returnObject.expected = 0;
   returnObject.awaitingExecutionAmount = 0;
-  returnObject.id = '';
+  delete returnObject.id;
   returnObject.paymentMethod = selectedRecord.paymentMethod;
   returnObject['paymentMethod' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER] = selectedRecord['paymentMethod' + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER];
   returnObject.currency = selectedRecord.currency;
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.26647]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.26933]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.26647]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
Binary file modules/org.openbravo.client.application/lib/runtime/guice-2.0.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpclient-4.0.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpcore-4.0.1.jar has changed
Binary file modules/org.openbravo.client.application/lib/runtime/httpmime-4.1.jar has changed
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -132,6 +132,18 @@
 <!--07AA67107E904AC9A1E80B407C9894BB-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--07AA67107E904AC9A1E80B407C9894BB--></AD_MESSAGE>
 
+<!--090A0260AFDA4799923FC2ADE44EB55B--><AD_MESSAGE>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <AD_MESSAGE_ID><![CDATA[090A0260AFDA4799923FC2ADE44EB55B]]></AD_MESSAGE_ID>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <VALUE><![CDATA[OBUIAPP_gSignInButtonDemoProfessional]]></VALUE>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <MSGTEXT><![CDATA[The <a href="http://centralrepository.openbravo.com/openbravo/org.openbravo.forge.ui/sso/ForgeModuleDetail/Google-Sign-In" target="_blank">module</a> that contains the <a href="http://wiki.openbravo.com/wiki/Configuration_Manual/Google_Integration" target="_blank">log in to application using Google Account</a> feature is not installed. Ask your System Administrator to install it.]]></MSGTEXT>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--090A0260AFDA4799923FC2ADE44EB55B-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--090A0260AFDA4799923FC2ADE44EB55B--></AD_MESSAGE>
+
 <!--090A37D22DDB1C89012DDB22CE910012--><AD_MESSAGE>
 <!--090A37D22DDB1C89012DDB22CE910012-->  <AD_MESSAGE_ID><![CDATA[090A37D22DDB1C89012DDB22CE910012]]></AD_MESSAGE_ID>
 <!--090A37D22DDB1C89012DDB22CE910012-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -581,6 +593,18 @@
 <!--42181711B0664B9A898BDE8754ADA4E0-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--42181711B0664B9A898BDE8754ADA4E0--></AD_MESSAGE>
 
+<!--42B286FCB7054BD49A7FCDE676DB736A--><AD_MESSAGE>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <AD_MESSAGE_ID><![CDATA[42B286FCB7054BD49A7FCDE676DB736A]]></AD_MESSAGE_ID>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <VALUE><![CDATA[OBUIAPP_gSignInButtonDemoCommunity]]></VALUE>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <MSGTEXT><![CDATA[<a href="http://wiki.openbravo.com/wiki/Configuration_Manual/Google_Integration" target="_blank">Log in to application using Google Account</a> is a Premium Feature]]></MSGTEXT>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--42B286FCB7054BD49A7FCDE676DB736A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--42B286FCB7054BD49A7FCDE676DB736A--></AD_MESSAGE>
+
 <!--48A6793A3C364216B184A33117EF7ED1--><AD_MESSAGE>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_MESSAGE_ID><![CDATA[48A6793A3C364216B184A33117EF7ED1]]></AD_MESSAGE_ID>
 <!--48A6793A3C364216B184A33117EF7ED1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -821,6 +845,18 @@
 <!--6831E84EB2124F08B3FCEF6F50CF8AD1-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--6831E84EB2124F08B3FCEF6F50CF8AD1--></AD_MESSAGE>
 
+<!--699499DEBB904E1B84D4CB28600647C7--><AD_MESSAGE>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <AD_MESSAGE_ID><![CDATA[699499DEBB904E1B84D4CB28600647C7]]></AD_MESSAGE_ID>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <VALUE><![CDATA[OBUIAPP_SignIn]]></VALUE>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <MSGTEXT><![CDATA[Sign in using]]></MSGTEXT>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--699499DEBB904E1B84D4CB28600647C7-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--699499DEBB904E1B84D4CB28600647C7--></AD_MESSAGE>
+
 <!--6B478D5FA6E442B19E29F29AFF70EDBA--><AD_MESSAGE>
 <!--6B478D5FA6E442B19E29F29AFF70EDBA-->  <AD_MESSAGE_ID><![CDATA[6B478D5FA6E442B19E29F29AFF70EDBA]]></AD_MESSAGE_ID>
 <!--6B478D5FA6E442B19E29F29AFF70EDBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1497,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>
@@ -1557,6 +1605,18 @@
 <!--CE3E9A8711D54E719F02630BE8D5E2FB-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--CE3E9A8711D54E719F02630BE8D5E2FB--></AD_MESSAGE>
 
+<!--CEA329C437C54C7AB101D4A3EC0A89EC--><AD_MESSAGE>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <AD_MESSAGE_ID><![CDATA[CEA329C437C54C7AB101D4A3EC0A89EC]]></AD_MESSAGE_ID>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <VALUE><![CDATA[OBUIAPP_NumOfSeledtedItemsChange]]></VALUE>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <MSGTEXT><![CDATA[There were %0 records selected prior to refreshing. Due to limitations regarding the page size, only the  first %1 record(s) selection has been kept.]]></MSGTEXT>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--CEA329C437C54C7AB101D4A3EC0A89EC--></AD_MESSAGE>
+
 <!--CF668C49E43D4FA799A43191EA10C17A--><AD_MESSAGE>
 <!--CF668C49E43D4FA799A43191EA10C17A-->  <AD_MESSAGE_ID><![CDATA[CF668C49E43D4FA799A43191EA10C17A]]></AD_MESSAGE_ID>
 <!--CF668C49E43D4FA799A43191EA10C17A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1665,6 +1725,18 @@
 <!--E16F552C980C451089FF20C93122A331-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--E16F552C980C451089FF20C93122A331--></AD_MESSAGE>
 
+<!--E1B1F9C89283486F90FEE70EDC716EB7--><AD_MESSAGE>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <AD_MESSAGE_ID><![CDATA[E1B1F9C89283486F90FEE70EDC716EB7]]></AD_MESSAGE_ID>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <VALUE><![CDATA[OBUIAPP_gSignInButtonDemoAltMsg]]></VALUE>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <MSGTEXT><![CDATA[Sign in using your Google Account]]></MSGTEXT>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--E1B1F9C89283486F90FEE70EDC716EB7-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--E1B1F9C89283486F90FEE70EDC716EB7--></AD_MESSAGE>
+
 <!--E20A23145D554996A09BC927B847F3BB--><AD_MESSAGE>
 <!--E20A23145D554996A09BC927B847F3BB-->  <AD_MESSAGE_ID><![CDATA[E20A23145D554996A09BC927B847F3BB]]></AD_MESSAGE_ID>
 <!--E20A23145D554996A09BC927B847F3BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.26647]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.26933]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.26647]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.26647]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.26647]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.26647]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.26933]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Wed Jun 17 11:03:12 2015 +0200
@@ -479,6 +479,7 @@
     testResources.add("web/org.openbravo.client.application/js/test/ob-property-store-test.js");
     testResources.add("web/org.openbravo.client.application/js/test/ob-utilities-date-test.js");
     testResources.add("web/org.openbravo.client.application/js/test/ob-navbar-test.js");
+    testResources.add("web/org.openbravo.client.application/js/test/ob-utilities-number-test.js");
     return testResources;
   }
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Wed Jun 17 11:03:12 2015 +0200
@@ -262,7 +262,7 @@
    * 
    * If the value is enclosed between brackets, it is extracted, translated and enclosed again
    * 
-   * @see DynamicExpressionParserTest
+   * There is a junit test in the class: DynamicExpressionParserTest
    * 
    * @param value
    *          A string expression like <b>'Y'</b>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/GlobalMenu.java	Wed Jun 17 11:03:12 2015 +0200
@@ -120,7 +120,7 @@
     final String menuHql = "select m from ADMenu m left join fetch m.aDMenuTrlList where m.module.enabled=true";
     final Query menuQry = OBDal.getInstance().getSession().createQuery(menuHql);
     @SuppressWarnings("unchecked")
-    List<Menu> menus = (List<Menu>) menuQry.list();
+    List<Menu> menus = menuQry.list();
 
     List<TreeNode> nodes = treeNodes.list();
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MultipleDeleteActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MultipleDeleteActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -66,7 +66,7 @@
       DataSourceService dataSourceService = getCustomDataSourceService(entityName);
       for (int i = 0; i < ids.length(); i++) {
         if (dataSourceService == null) {
-          final BaseOBObject object = OBDal.getInstance().get(entityName, (String) ids.get(i));
+          final BaseOBObject object = OBDal.getInstance().get(entityName, ids.get(i));
           if (object != null) {
             OBDal.getInstance().remove(object);
             // https://issues.openbravo.com/view.php?id=21229#c51631
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java	Wed Jun 17 11:03:12 2015 +0200
@@ -138,21 +138,21 @@
     if (!checkRequestMap()) {
       return null;
     }
-    return (String) requestMap.get(OBBindingsConstants.WINDOW_ID_PARAM);
+    return requestMap.get(OBBindingsConstants.WINDOW_ID_PARAM);
   }
 
   public String getTabId() {
     if (!checkRequestMap()) {
       return null;
     }
-    return (String) requestMap.get(OBBindingsConstants.TAB_ID_PARAM);
+    return requestMap.get(OBBindingsConstants.TAB_ID_PARAM);
   }
 
   public String getCommandType() {
     if (!checkRequestMap()) {
       return null;
     }
-    return (String) requestMap.get(OBBindingsConstants.COMMAND_TYPE_PARAM);
+    return requestMap.get(OBBindingsConstants.COMMAND_TYPE_PARAM);
   }
 
   public Boolean isPosted() {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/WindowSettingsActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -35,6 +35,7 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.Property;
 import org.openbravo.client.application.personalization.PersonalizationHandler;
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.client.kernel.KernelUtils;
@@ -79,10 +80,18 @@
       final String roleId = OBContext.getOBContext().getRole().getId();
       final DalConnectionProvider dalConnectionProvider = new DalConnectionProvider();
       final JSONObject jsonUIPattern = new JSONObject();
+      final String windowType = window.getWindowType();
       for (Tab tab : window.getADTabList()) {
         final boolean readOnlyAccess = org.openbravo.erpCommon.utility.WindowAccessData
             .hasReadOnlyAccess(dalConnectionProvider, roleId, tab.getId());
         String uiPattern = readOnlyAccess ? "RO" : tab.getUIPattern();
+        // window should be read only when is assigned with a table defined as a view
+        if (!"RO".equals(uiPattern) && ("T".equals(windowType) || "M".equals(windowType))
+            && tab.getTable().isView()) {
+          log4j.warn("Tab \"" + tab.getName()
+              + "\" is set to read only because is assigned with a table defined as a view.");
+          uiPattern = "RO";
+        }
         jsonUIPattern.put(tab.getId(), uiPattern);
       }
       final JSONObject json = new JSONObject();
@@ -124,15 +133,21 @@
               final Set<String> fields = new TreeSet<String>();
               for (Field field : tabAccess.getTab().getADFieldList()) {
                 if (!field.isReadOnly() && !field.isShownInStatusBar()) {
-                  fields.add(KernelUtils.getProperty(entity, field).getName());
+                  final Property property = KernelUtils.getProperty(entity, field);
+                  if (property != null) {
+                    fields.add(property.getName());
+                  }
                 }
               }
               for (FieldAccess fieldAccess : tabAccess.getADFieldAccessList()) {
                 if (fieldAccess.isActive()) {
-                  final String name = KernelUtils.getProperty(entity, fieldAccess.getField())
-                      .getName();
-                  jFields.put(name, fieldAccess.isEditableField());
-                  fields.remove(name);
+                  final Property property = KernelUtils.getProperty(entity, fieldAccess.getField());
+                  if (property != null) {
+                    final String name = KernelUtils.getProperty(entity, fieldAccess.getField())
+                        .getName();
+                    jFields.put(name, fieldAccess.isEditableField());
+                    fields.remove(name);
+                  }
                 }
               }
               for (String name : fields) {
@@ -220,13 +235,13 @@
             if (settingValue instanceof List) {
               for (Object callbackExtra : (List<?>) settingValue) {
                 if (callbackExtra instanceof String) {
-                  extraCallbacks.put((String) callbackExtra);
+                  extraCallbacks.put(callbackExtra);
                 } else {
                   log4j.warn("You are trying to set a wrong instance of extraCallbacks");
                 }
               }
             } else if (settingValue instanceof String) {
-              extraCallbacks.put((String) settingValue);
+              extraCallbacks.put(settingValue);
             } else {
               log4j.warn("You are trying to set a wrong instance of extraCallbacks");
             }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -112,7 +112,7 @@
     for (Entity entity : ModelProvider.getInstance().getEntityWithImage().keySet()) {
       entityArray.add(entity);
     }
-    return (Entity[]) entityArray.toArray(new Entity[entityArray.size()]);
+    return entityArray.toArray(new Entity[entityArray.size()]);
   }
 
   // Check if this image is used by another product
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -45,7 +45,8 @@
  * following deletion fails as the record is not longer present. This class works around that by
  * explicitely deleting c_ordertax entries on delete of c_order. (Same for c_invoicetax)
  * 
- * @link https://issues.openbravo.com/view.php?id=17199
+ * {@link "https://issues.openbravo.com/view.php?id=17199"}
+ * 
  * @author shuehner
  */
 public class ReorderCascadingChildDeletionsHandler extends EntityPersistenceEventObserver {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TableTreeEventHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TableTreeEventHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -37,8 +37,6 @@
 import org.openbravo.model.ad.datamodel.Table;
 import org.openbravo.model.ad.utility.TableTree;
 import org.openbravo.service.db.DalConnectionProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This event handler listen to events that are fired in the TableTree table. This table is used to
@@ -50,7 +48,6 @@
 public class TableTreeEventHandler extends EntityPersistenceEventObserver {
 
   private static Entity[] entities = { ModelProvider.getInstance().getEntity(TableTree.ENTITY_NAME) };
-  private static Logger logger = LoggerFactory.getLogger(TableTreeEventHandler.class);
   private static final String ADTREE_STRUCTURE = "ADTree";
 
   @Override
@@ -82,10 +79,15 @@
   }
 
   /**
-   * Checks that no other ADTree structured tree exists for this table, throws an exception if this occurs
-   * @param table table being checked
-   * @param treeStructure treestructure of the added/updated tree
-   * @param recordId null if a new record is being created or id of the record being modified
+   * Checks that no other ADTree structured tree exists for this table, throws an exception if this
+   * occurs
+   * 
+   * @param table
+   *          table being checked
+   * @param treeStructure
+   *          treestructure of the added/updated tree
+   * @param recordId
+   *          null if a new record is being created or id of the record being modified
    */
   private void checkTreeStructure(Table table, String treeStructure, String recordId) {
     if (ADTREE_STRUCTURE.equals(treeStructure)) {
@@ -94,7 +96,7 @@
       obq.add(Restrictions.eq(TableTree.PROPERTY_TABLE, table));
       obq.add(Restrictions.eq(TableTree.PROPERTY_TREESTRUCTURE, treeStructure));
       if (recordId != null) {
-          obq.add(Restrictions.ne(TableTree.PROPERTY_ID, recordId));
+        obq.add(Restrictions.ne(TableTree.PROPERTY_ID, recordId));
       }
       if (obq.count() > 0) {
         String language = OBContext.getOBContext().getLanguage().getLanguage();
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -167,6 +167,6 @@
     for (Table treeTable : treeTableList) {
       entityArray.add(ModelProvider.getInstance().getEntityByTableId(treeTable.getId()));
     }
-    return (Entity[]) entityArray.toArray(new Entity[entityArray.size()]);
+    return entityArray.toArray(new Entity[entityArray.size()]);
   }
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -69,7 +69,7 @@
       final String action = request.getString("action");
 
       if ("INITIALIZE".equals(action)) {
-        String productId = (String) request.getString("productId");
+        String productId = request.getString("productId");
         Product product = OBDal.getInstance().get(Product.class, productId);
 
         // Retrieves all the product invariant characteristics
@@ -120,7 +120,7 @@
         response.put("productId", productId);
         return response;
       } else {
-        String productId = (String) request.getString("productId");
+        String productId = request.getString("productId");
         Product product = OBDal.getInstance().get(Product.class, productId);
         final JSONObject updatedValues = request.getJSONObject("updatedValues");
         final JSONObject existingProdChValues = request.getJSONObject("existingProdChValues");
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -269,8 +269,8 @@
     final JSONArray jsonArray = new JSONArray();
     for (BaseOBObject bob : objects) {
       final JSONObject jsonArrayItem = new JSONObject();
-      jsonArrayItem.put(JsonConstants.ID, (String) bob.getId());
-      jsonArrayItem.put(JsonConstants.IDENTIFIER, (String) bob.getIdentifier());
+      jsonArrayItem.put(JsonConstants.ID, bob.getId());
+      jsonArrayItem.put(JsonConstants.IDENTIFIER, bob.getIdentifier());
       jsonArray.put(jsonArrayItem);
     }
     return jsonArray;
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -470,7 +470,7 @@
       } else {
         jsonObject = new JSONObject();
       }
-      jsonObject.put(target, (Object) jsonValue);
+      jsonObject.put(target, jsonValue);
       uiPersonalization.setValue(jsonObject.toString());
       OBDal.getInstance().save(uiPersonalization);
       return uiPersonalization;
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java	Wed Jun 17 11:03:12 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	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java	Wed Jun 17 11:03:12 2015 +0200
@@ -19,23 +19,53 @@
 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.JRTextExporter;
+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.SimpleTextExporterConfiguration;
+import net.sf.jasperreports.export.SimpleTextReportConfiguration;
+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 +74,98 @@
 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 double TEXT_CHAR_HEIGHT = 10;
+  private static final double TEXT_CHAR_WIDTH = 10;
   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 +173,724 @@
    *          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 TXT:
+      saveTxtReportToFile(jasperPrint, target);
+      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 TXT:
+      saveTxtReportToOutputStream(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 plain text 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 saveTxtReportToFile(JasperPrint jasperPrint, File file) throws JRException {
+    final JRTextExporter textExporter = new JRTextExporter();
+    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+    SimpleWriterExporterOutput exporterOutput = new SimpleWriterExporterOutput(file);
+
+    // Default text configuration that can be overridden in the .jrxml template itself
+    SimpleTextExporterConfiguration textExporterConfiguration = new SimpleTextExporterConfiguration();
+    textExporterConfiguration.setOverrideHints(false);
+    textExporter.setConfiguration(textExporterConfiguration);
+    // Default item text configuration that can be overridden in the .jrxml template itself
+    SimpleTextReportConfiguration textReportConfiguration = new SimpleTextReportConfiguration();
+    textReportConfiguration.setCharHeight(new Float(TEXT_CHAR_HEIGHT));
+    textReportConfiguration.setCharWidth(new Float(TEXT_CHAR_WIDTH));
+    textReportConfiguration.setOverrideHints(false);
+    textExporter.setConfiguration(textReportConfiguration);
+
+    textExporter.setExporterInput(exporterInput);
+    textExporter.setExporterOutput(exporterOutput);
+    textExporter.exportReport();
+  }
+
+  /**
+   * Generates a plain text 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 saveTxtReportToOutputStream(JasperPrint jasperPrint, OutputStream outputStream)
+      throws JRException {
+    final JRTextExporter textExporter = new JRTextExporter();
+    SimpleExporterInput exporterInput = new SimpleExporterInput(jasperPrint);
+    SimpleWriterExporterOutput exporterOutput = new SimpleWriterExporterOutput(outputStream);
+
+    // Default text configuration that can be overridden in the .jrxml template itself
+    SimpleTextExporterConfiguration textExporterConfiguration = new SimpleTextExporterConfiguration();
+    textExporterConfiguration.setOverrideHints(false);
+    textExporter.setConfiguration(textExporterConfiguration);
+    // Default item text configuration that can be overridden in the .jrxml template itself
+    SimpleTextReportConfiguration textReportConfiguration = new SimpleTextReportConfiguration();
+    textReportConfiguration.setCharHeight(new Float(TEXT_CHAR_HEIGHT));
+    textReportConfiguration.setCharWidth(new Float(TEXT_CHAR_WIDTH));
+    textReportConfiguration.setOverrideHints(false);
+    textExporter.setConfiguration(textReportConfiguration);
+
+    textExporter.setExporterInput(exporterInput);
+    textExporter.setExporterOutput(exporterOutput);
+    textExporter.exportReport();
+  }
+
+  /**
+   * Generates a plain text report using the SimpleExporterInput, SimpleWriterExporterOutput,
+   * SimpleTextExporterConfiguration and SimpleTextReportConfiguration received as parameters.
+   * 
+   * @param exporterInput
+   *          SimpleExporterInput object with the input data.
+   * @param exporterOutput
+   *          SimpleWriterExporterOutput object with the output data.
+   * @param textExporterConfiguration
+   *          SimpleTextExporterConfiguration with the configuration data.
+   * @param textReportConfiguration
+   *          SimpleTextReportConfiguration with the item configuration data.
+   * @throws JRException
+   *           In case there is any error generating the report an exception is thrown with the
+   *           error message.
+   */
+  public static void saveTxtReport(SimpleExporterInput exporterInput,
+      SimpleWriterExporterOutput exporterOutput,
+      SimpleTextExporterConfiguration textExporterConfiguration,
+      SimpleTextReportConfiguration textReportConfiguration) throws JRException {
+    final JRTextExporter textExporter = new JRTextExporter();
+    textExporter.setExporterInput(exporterInput);
+    textExporter.setExporterOutput(exporterOutput);
+    textExporter.setConfiguration(textExporterConfiguration);
+    textExporter.setConfiguration(textReportConfiguration);
+    textExporter.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 +903,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 +1252,65 @@
    * 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);
       }
     }), //
+    /**
+     * TXT export type
+     */
+    @SuppressWarnings("serial")
+    TXT("txt", "100", new HashMap<String, Object>() {
+      {
+        put("IS_IGNORE_PAGINATION", true);
+      }
+    }), //
+    /**
+     * 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 +1324,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 +1336,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 +1362,41 @@
 
     /**
      * 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 ("TXT".equals(action)) {
+        return ExportType.TXT;
       } 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 +1410,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.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed Jun 17 11:03:12 2015 +0200
@@ -366,7 +366,7 @@
     OBQuery<Note> obq = OBDal.getInstance().createQuery(Note.class,
         " table.id=:tableId and record=:recordId");
     obq.setFilterOnReadableOrganization(false);
-    obq.setNamedParameter("tableId", (String) DalUtil.getId(tab.getTable()));
+    obq.setNamedParameter("tableId", DalUtil.getId(tab.getTable()));
     obq.setNamedParameter("recordId", rowId);
     return obq.count();
   }
@@ -403,11 +403,11 @@
       Object[] array = (Object[]) qobj;
       JSONObject obj = new JSONObject();
       try {
-        obj.put("name", (String) array[0]);
-        obj.put("id", (String) array[1]);
+        obj.put("name", array[0]);
+        obj.put("id", array[1]);
         obj.put("age", (new Date().getTime() - ((Date) array[2]).getTime()));
-        obj.put("updatedby", (String) array[3]);
-        obj.put("description", (String) array[4]);
+        obj.put("updatedby", array[3]);
+        obj.put("description", array[4]);
       } catch (JSONException e) {
         log.error("Error while reading attachments", e);
       }
@@ -1070,8 +1070,6 @@
     }
 
     Entity parentEntity = parentRecord.getEntity();
-    Entity entity = ModelProvider.getInstance().getEntityByTableId(
-        field.getTab().getTable().getId());
     Property property = KernelUtils.getProperty(field);
     Entity referencedEntity = property.getReferencedProperty().getEntity();
     return referencedEntity.equals(parentEntity);
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java	Wed Jun 17 11:03:12 2015 +0200
@@ -20,7 +20,6 @@
 
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.client.kernel.BaseActionHandler;
@@ -30,8 +29,6 @@
 
 public class GetNameGeneralLedger extends BaseActionHandler {
 
-  private static final Logger log = Logger.getLogger(GetNameGeneralLedger.class);
-
   @Override
   protected JSONObject execute(Map<String, Object> parameters, String content) {
     OBContext.setAdminMode();
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -71,8 +71,7 @@
       String parentObjectId = (String) parameters.get("parentObjectId");
       Entity entity = ModelProvider.getInstance().getEntityByTableName(table.getDBTableName());
       String propertyName = entity.getPropertyByColumnName(columnName).getName();
-      BaseOBObject parentObject = (BaseOBObject) OBDal.getInstance().get(entity.getName(),
-          parentObjectId);
+      BaseOBObject parentObject = OBDal.getInstance().get(entity.getName(), parentObjectId);
       parentObject.set(propertyName, null);
       return new JSONObject();
     } else if (parameters.get("command").equals("GETSIZE")) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -895,7 +895,6 @@
     private String displaylogicgrid = "";
 
     private int gridSort = 0;
-    private String id;
 
     public String getOnChangeFunction() {
       return field.getOnChangeFunction();
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java	Wed Jun 17 11:03:12 2015 +0200
@@ -27,6 +27,7 @@
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
+import org.openbravo.client.application.ApplicationUtils;
 import org.openbravo.client.application.GCSystem;
 import org.openbravo.client.application.GCTab;
 import org.openbravo.client.application.window.OBViewFieldHandler.OBViewField;
@@ -297,10 +298,19 @@
       requiredGridProperties.add(propertyName);
     }
 
-    // Always include the propertyt that links to the parent tab
+    // Always include the property that links to the parent tab
     String linkToParentPropertyName = this.getLinkToParentPropertyName();
     if (linkToParentPropertyName != null && !linkToParentPropertyName.isEmpty()) {
       requiredGridProperties.add(linkToParentPropertyName);
+    } else {
+      // See issue https://issues.openbravo.com/view.php?id=30132
+      // If the child tab does not have a property marked as link to parent, look for the property
+      // in the entity of the tab pointing to the parent tab
+      String parentPropertyName = this.getParentPropertyName();
+      if (parentPropertyName != null && !parentPropertyName.isEmpty()
+          && !requiredGridProperties.contains(parentPropertyName)) {
+        requiredGridProperties.add(parentPropertyName);
+      }
     }
 
     // Include the Stored in Session properties
@@ -398,6 +408,23 @@
     return null;
   }
 
+  private String getParentPropertyName() {
+    Tab parentTab = KernelUtils.getInstance().getParentTab(tab);
+    if (parentTab == null) {
+      return null;
+    }
+    String parentProperty = null;
+    if (tab.getTable().getId().equals(parentTab.getTable().getId())
+        && ("RO".equals(tab.getUIPattern()) || "SR".equals(tab.getUIPattern()))) {
+      if (entity.getIdProperties().size() > 0) {
+        parentProperty = entity.getIdProperties().get(0).getName();
+      }
+    } else {
+      parentProperty = ApplicationUtils.getParentProperty(tab, parentTab);
+    }
+    return parentProperty;
+  }
+
   /**
    * Returns true if the grid should filter and sort lazily. In that case, the changes done by the
    * user to filter editor and to the grid sorting will not by applied until the user clicks on an
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js	Wed Jun 17 11:03:12 2015 +0200
@@ -330,7 +330,7 @@
         this.emptyMessage = this.emptyDataMessage;
       },
       dataArrived: function (startRow, endRow) {
-        if (startRow === 0 && endRow === -1) {
+        if (this.data && this.data.getLength && this.data.getLength() === 0) {
           this.showNoRowsMessage();
         }
         return this.Super('dataArrived', arguments);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Jun 17 11:03:12 2015 +0200
@@ -217,6 +217,10 @@
         //  instead of using targetRecordId to improve the performance
         startRow = this.grid.selectedRecordInitInterval;
         endRow = this.grid.selectedRecordEndInterval;
+        // the startRow and endRow are being modified, so the localData attribute also
+        // needs to be updated to wait for the proper records
+        this.localData = [];
+        this.setRangeLoading(startRow, endRow);
       }
       return this.Super('fetchRemoteData', arguments);
     },
@@ -487,7 +491,7 @@
 
     // only show summary rows if there are summary functions
     for (i = 0; i < this.getFields().length; i++) {
-      if (this.getFields()[i].summaryFunction) {
+      if (this.getFields()[i].summaryFunction && !this.lazyFiltering) {
         this.showGridSummary = true;
       }
     }
@@ -1785,6 +1789,12 @@
         this.selectedRecordEndInterval = this.selectedRecordInitInterval + this.data.resultSize;
       }
       this.notRemoveFilter = true;
+      if (this.getSelectedRecords().length > 1) {
+        this.selectedRecordsBeforeRefresh = [];
+        for (i = 0; i < this.getSelectedRecords().length; i++) {
+          this.selectedRecordsBeforeRefresh.push(this.getSelectedRecords()[i][OB.Constants.ID]);
+        }
+      }
     } else {
       visibleRows = this.getVisibleRows();
       if (visibleRows && visibleRows[0] > 0) {
@@ -1833,6 +1843,7 @@
       criteria = originalCriteria;
     }
     filterDataCallback = function () {
+      var i, gridRecord, recordIndexes = [];
       if (me.refreshingWithScrolledGrid) {
         // move the scroll to part of the grid that contains the data that was just received to
         // prevent unneded requests (see https://issues.openbravo.com/view.php?id=25811)
@@ -1846,6 +1857,25 @@
       delete me.selectedRecordInitInterval;
       delete me.selectedRecordEndInterval;
       delete me.selectedRecordId;
+
+      if (me.selectedRecordsBeforeRefresh) {
+        for (i = 0; i < me.selectedRecordsBeforeRefresh.length; i++) {
+          gridRecord = me.data.find(OB.Constants.ID, me.selectedRecordsBeforeRefresh[i]);
+          if (gridRecord !== null) {
+            recordIndexes.push(me.getRecordIndex(gridRecord));
+          }
+        }
+        me.singleRecordSelection = false;
+        me.selectRecords(recordIndexes);
+        if (me.selectedRecordsBeforeRefresh.length !== recordIndexes.length) {
+          if (me.view.messageBar.isVisible()) {
+            isc.warn(OB.I18N.getLabel('OBUIAPP_NumOfSeledtedItemsChange', [me.selectedRecordsBeforeRefresh.length, recordIndexes.length]));
+          } else {
+            me.view.messageBar.setMessage(isc.OBMessageBar.TYPE_WARNING, null, OB.I18N.getLabel('OBUIAPP_NumOfSeledtedItemsChange', [me.selectedRecordsBeforeRefresh.length, recordIndexes.length]));
+          }
+        }
+        delete me.selectedRecordsBeforeRefresh;
+      }
     };
     this.filterData(criteria, filterDataCallback, context);
     // Set the refreshingWithRecordSelected and refreshingWithScrolledGrid flags to true when needed after
@@ -3413,7 +3443,7 @@
     return ret;
   },
 
-  //used in Edit or Delete only UI pattern
+  //used in Edit or Delete only UI pattern and in Single Record UI pattern
   setListEndEditAction: function () {
     this.listEndEditAction = 'done';
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Jun 17 11:03:12 2015 +0200
@@ -869,7 +869,7 @@
   // It adds a tab with the whole view content based on the provided 'childView'.
   // If 'tab' parameter is provided, the 'childView' content is loaded inside the provided tab.
   prepareFullChildView: function (childView, tab) {
-    var length, i, actionButton, lastCalledSizeFunction;
+    var length, i, actionButton, toolBarButton, lastCalledSizeFunction;
 
     // Add buttons in parent to child. Note that currently it is only added one level.
     if (this.actionToolbarButtons && this.actionToolbarButtons.length > 0 && childView.showParentButtons) {
@@ -881,6 +881,12 @@
         actionButton.contextView = this; // Context is still parent view
         actionButton.toolBar = childView.toolBar;
         actionButton.view = childView;
+        if (this.toolBar && this.toolBar.rightMembers) {
+          toolBarButton = this.toolBar.rightMembers.find('property', actionButton.property);
+          if (toolBarButton && toolBarButton.readOnlyIf) {
+            actionButton.readOnlyIf = toolBarButton.readOnlyIf;
+          }
+        }
 
         childView.toolBar.rightMembers.push(actionButton);
 
@@ -972,12 +978,19 @@
   setEditOrDeleteOnly: function (editOrDeleteOnly) {
     this.editOrDeleteOnly = editOrDeleteOnly;
     if (editOrDeleteOnly) {
-      this.viewGrid.setListEndEditAction();
+      this.dontCreateNewRowAutomatically();
     }
   },
 
   setSingleRecord: function (singleRecord) {
     this.singleRecord = singleRecord;
+    if (singleRecord) {
+      this.dontCreateNewRowAutomatically();
+    }
+  },
+
+  dontCreateNewRowAutomatically: function () {
+    this.viewGrid.setListEndEditAction();
   },
 
   allowNewRow: function () {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Wed Jun 17 11:03:12 2015 +0200
@@ -685,10 +685,22 @@
     return this.fieldsByColumnName[columnName];
   },
 
-  setValueMap: function (field, entries) {
+  // sets a valueMap in the edit form for the row that is currently being edited
+  // in case it exists
+  setValueMapInEditForm: function (field, entries) {
     var len = entries.length,
         map = {},
-        i, undef;
+        i, undef, form, editField;
+
+    form = this.getEditForm();
+    if (!form) {
+      return;
+    }
+
+    editField = form.getField(field);
+    if (!editField) {
+      return;
+    }
 
     for (i = 0; i < len; i++) {
       if (entries[i][OB.Constants.ID] !== undef) {
@@ -696,7 +708,7 @@
       }
     }
 
-    this.Super('setValueMap', [field, map]);
+    editField.setValueMap(map);
   },
 
   processColumnValue: function (rowNum, columnName, columnValue) {
@@ -709,16 +721,21 @@
       return;
     }
     if (columnValue.entries) {
-      this.setValueMap(field.name, columnValue.entries);
+      this.setValueMapInEditForm(field.name, columnValue.entries);
     } else if (field.fkField && columnValue.value && columnValue.identifier && field.canEdit !== false) {
       // build the valueMap manually, set it and set the value of the
       // fk combo item in the edit form if possible
       valueMap[0] = {};
       valueMap[0][OB.Constants.ID] = columnValue.value;
       valueMap[0][OB.Constants.IDENTIFIER] = columnValue.identifier;
-      this.setValueMap(field.name, valueMap);
+      this.setValueMapInEditForm(field.name, valueMap);
       if (this.isEditing()) {
         this.setEditValue(this.getEditRow(), field.name, columnValue.value);
+        // see issue https://issues.openbravo.com/view.php?id=30060
+        // explicitly set the display value
+        if (field.displayField) {
+          this.setEditValue(this.getEditRow(), field.displayField, columnValue.identifier);
+        }
       }
     }
   },
@@ -781,16 +798,20 @@
   },
 
   retrieveInitialValues: function (rowNum, colNum, newCell, newRow, suppressFocus) {
-    var requestParams, allProperties, i, record;
+    var requestParams, allProperties, i, record, newRecord;
 
     allProperties = this.getContextInfo(rowNum);
     record = this.getRecord(rowNum);
 
+    // we can't rely on newRow value to know if we're inserting a new record,
+    // a new record is being created if record has no value
+    newRecord = !record;
+
     requestParams = {
-      MODE: (newRow ? 'NEW' : 'EDIT'),
+      MODE: (newRecord ? 'NEW' : 'EDIT'),
       PARENT_ID: null,
       TAB_ID: this.viewProperties.tabId,
-      ROW_ID: (!newRow && record ? record[OB.Constants.ID] : null)
+      ROW_ID: null //ROW_ID is null to avoid edited values be overriden by the FIC
     };
 
     OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', allProperties, requestParams, this.processFICReturn, {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js	Wed Jun 17 11:03:12 2015 +0200
@@ -0,0 +1,218 @@
+/*
+ *************************************************************************
+ * 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) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+/*global QUnit */
+
+QUnit.module('org.openbravo.client.application1');
+
+QUnit.test('OB.Utilities.Number. ScientificToDecimal, OBMaskedToOBPlain and roundJSNumber functions', function () {
+  QUnit.expect(6);
+
+  var outputText = '';
+  var decSeparator = '.';
+  var groupSeparator = ',';
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.ScientificToDecimal works properly';
+    var failureText = 'OB.Utilities.Number.ScientificToDecimal failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['-5E-4', '-0.0005'],
+      ['-5E4', '-50000'],
+      ['5E7', '50000000'],
+      ['-1.056E-5', '-0.00001056'],
+      ['-1.056E5', '-105600'],
+      ['1.056E-5', '0.00001056'],
+      ['1.056E5', '105600'],
+      ['-1.2E-5', '-0.000012'],
+      ['-1.2E5', '-120000'],
+      ['1.2E-5', '0.000012'],
+      ['1.2E5', '120000'],
+      ['-3.566E-4', '-0.0003566']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.ScientificToDecimal(list[i][0], decSeparator);
+      if (normalizedDisplayFormat !== list[i][1]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + list[i][1] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.OBMaskedToOBPlain works properly when the exponent of the scientific number ends with 0';
+    var failureText = 'OB.Utilities.Number.OBMaskedToOBPlain failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['1.12E10', '11200000000'],
+      ['1.12E-10', '0.000000000112'],
+      ['-1.0564E10', '-10564000000'],
+      ['1.056E-5', '0.00001056']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.OBMaskedToOBPlain(list[i][0], decSeparator, groupSeparator);
+      if (normalizedDisplayFormat !== list[i][1]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + list[i][1] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.ScientificToDecimal works properly for the conversion of the numbers from scientific notation to decimal notation in the case of the upper case E, lower case e and if a sign is added to the exponent';
+    var failureText = 'OB.Utilities.Number.ScientificToDecimal failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['1.12E10', '11200000000'],
+      ['-5E20', '-500000000000000000000'],
+      ['-1.056E10', '-10560000000'],
+      ['1.12E+10', '11200000000'],
+      ['-5E+20', '-500000000000000000000'],
+      ['-1.056E+10', '-10560000000'],
+      ['1.12e10', '11200000000'],
+      ['-5e20', '-500000000000000000000'],
+      ['-1.056e10', '-10560000000'],
+      ['1.12e+10', '11200000000'],
+      ['-5e+20', '-500000000000000000000'],
+      ['-1.056e+10', '-10560000000']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.ScientificToDecimal(list[i][0], decSeparator);
+      if (normalizedDisplayFormat !== list[i][1]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + list[i][1] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.ScientificToDecimal works properly';
+    var failureText = 'OB.Utilities.Number.ScientificToDecimal failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['1.020050045E7', '10200500.45'],
+      ['-1.020050045E7', '-10200500.45'],
+      ['1.020050000E7', '10200500.00'],
+      ['-1.020050000E7', '-10200500.00']
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.ScientificToDecimal(list[i][0], decSeparator);
+      if (normalizedDisplayFormat !== list[i][1]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + list[i][1] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.roundJSNumber works properly';
+    var failureText = 'OB.Utilities.Number.roundJSNumber failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list1 = [
+      [0.145, 2],
+      [1.145, 2],
+      [10.145, 2],
+      [14.499999999999998, 2]
+    ];
+    var list2 = [
+      [0.15],
+      [1.15],
+      [10.15],
+      [14.5]
+    ];
+    for (i = 0; i < list1.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.roundJSNumber(list1[i][0], list1[i][1]);
+      if (normalizedDisplayFormat !== list2[i][0]) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + 'number ' + list1[i][0] + ' with ' + list1[i][1] + 'decimals' + '\') === \'' + list2[i][0] + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+
+  QUnit.ok((function () {
+    var i;
+    var successText = 'OB.Utilities.Number.roundJSNumber works properly when the parameter is NaN';
+    var failureText = 'OB.Utilities.Number.roundJSNumber failed while eval';
+    var success = true;
+    var normalizedDisplayFormat;
+    var list = [
+      ['a', 2],
+      ['12a', 2]
+    ];
+    for (i = 0; i < list.length; i++) {
+      normalizedDisplayFormat = OB.Utilities.Number.roundJSNumber(list[i][0], list[i][1]);
+      if (!isNaN(normalizedDisplayFormat)) {
+        success = false;
+        failureText = failureText + ' normalizeDisplayFormat(\'' + list[i][0] + '\') === \'' + '\' (returned: ' + normalizedDisplayFormat + ') &';
+      }
+    }
+    if (success) {
+      outputText = successText;
+    } else {
+      failureText = failureText.substring(0, failureText.length - 2);
+      outputText = failureText;
+    }
+    return success;
+  }()), outputText);
+});
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Wed Jun 17 11:03:12 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) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -28,6 +28,11 @@
   contextView: null,
   labelValue: {},
 
+  initWidget: function () {
+    this.originalTitle = this.title;
+    this.Super('initWidget', arguments);
+  },
+
   action: function () {
     this.runProcess();
   },
@@ -246,7 +251,7 @@
 
   updateState: function (record, hide, context, keepNonAutosave) {
     var currentValues = isc.shallowClone(record || this.contextView.getCurrentValues() || {}),
-        grid;
+        grid, buttonValue, label, buttonValues = [];
     // do not hide non autosave buttons when hidding the rest if keepNonAutosave === true
     var hideButton = hide && (!keepNonAutosave || this.autosave);
 
@@ -273,13 +278,12 @@
       this.visible = !this.displayIf || (context && this.displayIf(this.contextView.viewForm, currentValues, context));
       readonly = this.readOnlyIf && context && this.readOnlyIf(this.contextView.viewForm, currentValues, context);
 
-      var buttonValue = record[this.property];
+      buttonValue = record[this.property];
       if (buttonValue === '--') {
         buttonValue = 'CL';
       }
 
-      // Changing button name associated with a list is not allowed in multi record buttons.
-      var label = this.labelValue[buttonValue];
+      label = this.labelValue[buttonValue];
       if (!label) {
         if (this.realTitle) {
           label = this.realTitle;
@@ -302,8 +306,31 @@
         OB.Utilities.fixNull250(currentValues);
         this.visible = this.visible && (!this.displayIf || (context && this.displayIf(this.contextView.viewForm, currentValues, context)));
         readonly = readonly || (this.readOnlyIf && context && this.readOnlyIf(this.contextView.viewForm, currentValues, context));
+        buttonValue = selection[i][this.property];
+        if (buttonValue === '--') {
+          buttonValue = 'CL';
+        }
+        if (buttonValues.indexOf(buttonValue) === -1) {
+          buttonValues.add(buttonValue);
+        }
       }
 
+      if (buttonValues.length === 1) {
+        label = this.labelValue[buttonValues[0]];
+        if (!label) {
+          if (this.realTitle) {
+            label = this.realTitle;
+          } else {
+            label = this.title;
+          }
+        }
+        this.realTitle = label;
+        this.setTitle(label);
+      } else {
+        label = this.originalTitle;
+        this.realTitle = label;
+        this.setTitle(label);
+      }
     }
 
     // Even visible is correctly set, it is necessary to execute show() or hide()
@@ -317,7 +344,5 @@
     } else {
       this.enable();
     }
-
-
   }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js	Wed Jun 17 11:03:12 2015 +0200
@@ -73,10 +73,10 @@
   var numberSign = '';
   if (plainNumber.substring(0, 1) === '+') {
     numberSign = '';
-    plainNumber = plainNumber.substring(1, number.length);
+    plainNumber = plainNumber.substring(1, plainNumber.length);
   } else if (plainNumber.substring(0, 1) === '-') {
     numberSign = '-';
-    plainNumber = plainNumber.substring(1, number.length);
+    plainNumber = plainNumber.substring(1, plainNumber.length);
   }
 
   // Remove ending decimal '0'
@@ -424,7 +424,7 @@
 
   number = number.toString();
   var coeficient, exponent, numberOfZeros, zeros = '',
-      i, split, index;
+      i, split, index, sign;
 
   // Look for 'e' or 'E' 
   if (number.indexOf('e') !== -1) {
@@ -453,7 +453,13 @@
       zeros = zeros + '0';
     }
     //Create the final number
-    number = '0.' + zeros + coeficient;
+    if (coeficient.substring(0, 1) === '-') {
+      sign = '-';
+      coeficient = coeficient.substring(1, coeficient.length);
+      number = sign + '0.' + zeros + coeficient;
+    } else {
+      number = '0.' + zeros + coeficient;
+    }
   } else { // Case the number is bigger than 1
     numberOfZeros = exponent.indexOf('+') !== -1 ? exponent.substring(1, exponent.length) : exponent;
     if (split) {
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.26647]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.26933]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.26647]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.26647]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.26933]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.26647]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.26647]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.26933]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.26647]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.26933]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java	Wed Jun 17 11:03:12 2015 +0200
@@ -173,7 +173,7 @@
    * @return an instance of clz
    */
   public <U extends Component> U createComponent(Class<U> clz) {
-    return (U) components.select(clz).get();
+    return components.select(clz).get();
   }
 
   /*
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponentProvider.java	Wed Jun 17 11:03:12 2015 +0200
@@ -48,7 +48,7 @@
    * @return an instance of clz
    */
   protected <U extends Component> U getComponent(Class<U> clz) {
-    return (U) WeldUtils.getInstanceFromStaticBeanManager(clz);
+    return WeldUtils.getInstanceFromStaticBeanManager(clz);
   }
 
   public Module getModule() {
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/GetLabelActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/GetLabelActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -22,7 +22,6 @@
 
 import javax.enterprise.context.ApplicationScoped;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.dal.core.OBContext;
@@ -34,7 +33,6 @@
  */
 @ApplicationScoped
 public class GetLabelActionHandler extends BaseActionHandler {
-  private static final Logger log = Logger.getLogger(GetLabelActionHandler.class);
 
   private static final String KEY_PARAMETER = "key";
   private static final String LABEL_PROPERTY = "label";
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java	Wed Jun 17 11:03:12 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-2014 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -435,7 +435,7 @@
     }
     List<Tab> subTabList = new ArrayList<Tab>();
     for (int i = 0; i < tabIds.length; i++) {
-      String tabId = ((KernelUtilsData) tabIds[i]).adTabId;
+      String tabId = tabIds[i].adTabId;
       Tab subTab = OBDal.getInstance().get(Tab.class, tabId);
       subTabList.add(subTab);
     }
@@ -453,9 +453,15 @@
 
   /**
    * Compute the property from the field, assuming that the field is defined on the basis of entity.
+   *
+   * @return The property associated to this field, <code>null</code> if the field is not associated
+   *         to any property or column
    */
   public static Property getProperty(Entity entity, org.openbravo.model.ad.ui.Field field) {
     if (field.getProperty() == null) {
+      if (field.getColumn() == null) {
+        return null;
+      }
       return entity.getPropertyByColumnName(field.getColumn().getDBColumnName());
     }
     return DalUtil.getPropertyFromPath(entity, field.getProperty());
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SetContextInfoActionHandler.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SetContextInfoActionHandler.java	Wed Jun 17 11:03:12 2015 +0200
@@ -4,7 +4,6 @@
 
 import javax.enterprise.context.ApplicationScoped;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -18,8 +17,6 @@
 @ApplicationScoped
 public class SetContextInfoActionHandler extends BaseActionHandler {
 
-  private static final Logger log = Logger.getLogger(SetContextInfoActionHandler.class);
-
   @Override
   protected JSONObject execute(Map<String, Object> parameters, String content) {
 
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java	Wed Jun 17 11:03:12 2015 +0200
@@ -243,9 +243,9 @@
        * 
        * TODO: don't load the ob-debug.js file if not in use
        */
-      if (isInDevelopment()
-          || OBPropertiesProvider.getInstance().getBooleanProperty("test.environment")) {
-        sb.insert(0, "var isDebug = true;\n\n");
+      if (isInDevelopment() || OBPropertiesProvider.getInstance().getBooleanProperty("test.environment")) {
+        // append a global isDebug var and the causes that provoked the application to enter Debug mode
+        sb.insert(0, String.format("var isDebug = true;\nvar debugCauses = {\n  isInDevelopment: %s,\n  isTestEnvironment: %s\n};\n\n", isInDevelopment(), OBPropertiesProvider.getInstance().getBooleanProperty("test.environment")));
       }
       sb.append("if (window.onerror && window.onerror.name === '"
           + KernelConstants.BOOTSTRAP_ERROR_HANDLER_NAME + "') { window.onerror = null; }");
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Jun 17 11:03:12 2015 +0200
@@ -532,8 +532,8 @@
       if (!isListReference && "AD_ORG_ID".equals(field.getColumn().getDBColumnName().toUpperCase())
           && "".equals(columnValue) && vars.getStringParameter("CHANGED_COLUMN").equals(columnName)) {
         JSONObject entry = new JSONObject();
-        entry.put(JsonConstants.ID, (String) columnValue);
-        entry.put(JsonConstants.IDENTIFIER, (String) columnValue);
+        entry.put(JsonConstants.ID, columnValue);
+        entry.put(JsonConstants.IDENTIFIER, columnValue);
         return entry.toString();
       }
       boolean comboreload = rq.getRequestParameter("donotaddcurrentelement") != null
--- a/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/ui-test-suite/index.html	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/ui-test-suite/index.html	Wed Jun 17 11:03:12 2015 +0200
@@ -27,6 +27,7 @@
 
 <script type="text/javascript" src="../js/LAB.min.js"></script>
 <script type="text/javascript"  src="./qunit/qunit.js"></script>
+<script src="../js/BigDecimal-all-1.0.1.min.js"></script>
 
 <title>Openbravo - Test Suite</title>
 </head>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.26647]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.26933]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.26647]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.26647]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/CalendarWidgetProvider.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/CalendarWidgetProvider.java	Wed Jun 17 11:03:12 2015 +0200
@@ -18,7 +18,6 @@
  */
 package org.openbravo.client.myob;
 
-import org.apache.log4j.Logger;
 import org.openbravo.client.kernel.KernelConstants;
 
 /**
@@ -30,8 +29,6 @@
 
   public static final String WIDGETCLASS_PARAMETER = "WIDGET_CLASS";
 
-  private static final Logger log = Logger.getLogger(CalendarWidgetProvider.class);
-
   @Override
   public String generate() {
     final String result = "isc.defineClass('" + KernelConstants.ID_PREFIX
--- a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java	Wed Jun 17 11:03:12 2015 +0200
@@ -68,12 +68,12 @@
    * Computes the widget title using the user's language, if no translation is available then the
    * {@link WidgetClass#getWidgetTitle()} is used.
    * 
-   * @param widgetInstance
+   * @param widgetClass
    *          the widget class of this instance is used to read the title
    * @return the title of the widget read from the widgetclass
-   * @see WidgetInstance#getOBKMOWidgetClass()
+   * @see WidgetInstance#getWidgetClass()
    * @see WidgetClassTrl
-   * @see WidgetClass#getTitle()
+   * @see WidgetClass#getWidgetTitle()
    */
   static String getWidgetTitle(WidgetClass widgetClass) {
     final String userLanguageId = OBContext.getOBContext().getLanguage().getId();
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js	Wed Jun 17 11:03:12 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-2012 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -32,10 +32,6 @@
       this.contentSource = document.location.protocol + this.contentSource.substring(this.contentSource.indexOf('//'));
     }
 
-    if (this.contentSource.indexOf('google.com/calendar') !== -1) {
-      this.contentSource = this.contentSource.replace("account", OB.User.email);
-    }
-
     return isc.HTMLFlow.create({
       contentsType: 'page',
       contentsURL: this.contentSource,
@@ -48,5 +44,11 @@
       this.contentSource = this.evaluateContents(this.parameters.src);
     }
     this.windowContents.setContentsURL(this.contentSource);
+  },
+  evaluateContents: function (str) {
+    if (str.indexOf('google.com/calendar') !== -1) {
+      str = str.replace("account", OB.User.email);
+    }
+    return this.Super('evaluateContents', arguments);
   }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/test/ob-myopenbravo-test.js	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/test/ob-myopenbravo-test.js	Wed Jun 17 11:03:12 2015 +0200
@@ -67,7 +67,10 @@
   });
 });
 
-QUnit.asyncTest('Move widget', function () {
+// skipping this test because it is unstable depending on factors like
+// instance type (community/professional), number of executions, etc.
+// TODO: fix it properly to make it stable
+QUnit.skip('Move widget', function () {
 
   var post = isc.addProperties({}, d, {
     'eventType': 'WIDGET_MOVED',
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.26647]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.26933]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.26647]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Wed Jun 17 11:03:12 2015 +0200
@@ -318,9 +318,9 @@
    * fields. If the HQL query already contains order by fields, the new fields are appended for the
    * existing fields.
    * 
-   * @param hQL
+   * @param hql
    *          original HQL query
-   * @param sortByParametersString
+   * @param sortBy
    *          parameter that contains sortBy field values
    * @return an updated HQL query that will set the order by fields
    */
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.26647]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.26933]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.26647]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.26647]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.26933]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.26647]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Wed Jun 17 11:03:12 2015 +0200
@@ -1192,16 +1192,13 @@
       }
       OBContext.restorePreviousMode();
     }
-    return (FieldProvider[]) totalData.toArray(new FieldProvider[totalData.size()]);
+    return totalData.toArray(new FieldProvider[totalData.size()]);
   }
 
   /**
    * This method combines the information from the transactions list and the last element inserted
    * into grouped data into total data.
    * 
-   * @param fieldProvider
-   * @param transactionsList
-   * @param totalData
    * @throws OBException
    */
   private boolean insertIntoTotal(FieldProvider data,
@@ -1223,8 +1220,6 @@
   /**
    * This method creates a field provider with the information of the transaction
    * 
-   * @param fin_FinaccTransaction
-   * @return
    * @throws OBException
    */
   private FieldProvider createFieldProviderForTransaction(FIN_FinaccTransaction transaction,
@@ -1471,11 +1466,6 @@
 
   /**
    * This method compares the status and the order criteria of the transactions and data
-   * 
-   * @param transaction
-   * @param data
-   * @param strOrdCrit
-   * @return
    */
   private boolean isBeforeStatusAndOrder(FIN_FinaccTransaction transaction, FieldProvider data,
       String strOrdCrit, String BPName, String BPCategory, String strProject) {
@@ -1495,11 +1485,6 @@
 
   /**
    * This method compares recursively the order criteria of the transactions and data
-   * 
-   * @param transaction
-   * @param data
-   * @param strOrdCrit
-   * @return
    */
   private boolean isBeforeOrder(FIN_FinaccTransaction transaction, FieldProvider data,
       String[] strOrdCritList, int i, String BPName, String BPCategory, String strProject) {
@@ -1646,10 +1631,6 @@
   /**
    * Compares two DIFFERENT payment status. If the first one goes before the second it returns true,
    * elsewise it returns false
-   * 
-   * @param firstValue
-   * @param secondValue
-   * @return
    */
   private boolean isBeforeStatus(String firstValue, String secondValue) {
     String[] strStatus = { firstValue, secondValue };
@@ -2121,7 +2102,7 @@
       final Session session = OBDal.getInstance().getSession();
       final Query query = session.createQuery(sql.toString());
       for (final Object o : query.list()) {
-        result.add(OBDal.getInstance().get(Invoice.class, (String) o));
+        result.add(OBDal.getInstance().get(Invoice.class, o));
       }
 
       return result;
@@ -2209,9 +2190,6 @@
 
   /**
    * Given a String of organizations this method returns an array of organizations
-   * 
-   * @param strOrgFamily
-   * @return
    */
   private Organization[] getOrganizations(Set<String> strOrgFamily) {
     Iterator<String> orgChildTreeIter = strOrgFamily.iterator();
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Wed Jun 17 11:03:12 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	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Wed Jun 17 11:03:12 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-db/database/sourcedata/AD_MODULE.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.26647]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.26933]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jun 17 11:03:12 2015 +0200
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.26647]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml	Wed Jun 03 17:51:06 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml	Wed Jun 17 11:03:12 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>