[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/b69e30e117b8 changeset: 34805:b69e30e117b8 user: RM packaging bot openbravo.com> date: Tue Sep 25 18:43:09 2018 + summary: CI: update AD_MODULE to version 34804 details: https://code.openbravo.com/erp/devel/pi/rev/fabe6e99f181 changeset: 34806:fabe6e99f181 user: RM packaging bot openbravo.com> date: Tue Sep 25 18:57:02 2018 + summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +-
[OpenbravoERP-commits] devel/main: 10 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/462eab118a3b changeset: 34796:462eab118a3b user: Asier Lostalé openbravo.com> date: Fri Sep 21 11:26:50 2018 +0200 summary: fixed bug 39332: PG 11: ad_db_modified function fails AD_DB_MODIFIED was failing in PG 11 because it was using pg_proc.proisagg column which does no longer exist starting from 11. Using that column was unneeded in any case because it was in query to get paramaters and it was filtering out functions using them, as those functions where already obtained in outer query, it is not needed to filter them again. details: https://code.openbravo.com/erp/devel/main/rev/45a672248561 changeset: 34797:45a672248561 user: Asier Lostalé openbravo.com> date: Fri Sep 21 11:34:01 2018 +0200 summary: related to bug 39332: PG 11: ad_db_modified function fails Added test cases covering ad_db_modified details: https://code.openbravo.com/erp/devel/main/rev/8432ac92f307 changeset: 34798:8432ac92f307 user: Carlos Aristu openbravo.com> date: Tue Sep 25 10:27:13 2018 +0200 summary: related to issue 39261: update javadoc information details: https://code.openbravo.com/erp/devel/main/rev/293ffdd59d35 changeset: 34799:293ffdd59d35 user: Javier Armendáriz openbravo.com> date: Tue Sep 25 10:42:56 2018 +0200 summary: Related to issue 39201: Updated copyright year details: https://code.openbravo.com/erp/devel/main/rev/b378ec3feb51 changeset: 34800:b378ec3feb51 user: Carlos Aristu openbravo.com> date: Tue Sep 25 11:04:15 2018 +0200 summary: related to issue 39332: Fix typo details: https://code.openbravo.com/erp/devel/main/rev/e63c07dcad18 changeset: 34801:e63c07dcad18 user: Javier Armendáriz openbravo.com> date: Tue Sep 25 13:02:24 2018 +0200 summary: Related to issue 38173: Using parameter instead of string replacement in query details: https://code.openbravo.com/erp/devel/main/rev/287f17e68880 changeset: 34802:287f17e68880 user: RM packaging bot openbravo.com> date: Tue Sep 25 12:16:03 2018 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/acd8c31a80d0 changeset: 34803:acd8c31a80d0 user: Mark gmail.com> date: Fri Sep 21 11:09:12 2018 -0400 summary: Fixes issue 39293: Improved Performance in Accounting Transaction Details Query Updated the FACT_ACCT_DATEACCT index to be a multi-column index on DATEACCT and FACT_ACCT_ID columns, and changed the order by clause of the tab to use it. details: https://code.openbravo.com/erp/devel/main/rev/646304f60e8f changeset: 34804:646304f60e8f user: Sandra Huguet openbravo.com> date: Tue Sep 25 16:47:57 2018 +0200 summary: related to issue 39293 code review changes modify the hql where clause to correctly apply the id of the table + DESC order details: https://code.openbravo.com/erp/devel/main/rev/b69e30e117b8 changeset: 34805:b69e30e117b8 user: RM packaging bot openbravo.com> date: Tue Sep 25 18:43:09 2018 + summary: CI: update AD_MODULE to version 34804 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml |
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/acd8c31a80d0 changeset: 34803:acd8c31a80d0 user: Mark gmail.com> date: Fri Sep 21 11:09:12 2018 -0400 summary: Fixes issue 39293: Improved Performance in Accounting Transaction Details Query Updated the FACT_ACCT_DATEACCT index to be a multi-column index on DATEACCT and FACT_ACCT_ID columns, and changed the order by clause of the tab to use it. details: https://code.openbravo.com/erp/devel/pi/rev/646304f60e8f changeset: 34804:646304f60e8f user: Sandra Huguet openbravo.com> date: Tue Sep 25 16:47:57 2018 +0200 summary: related to issue 39293 code review changes modify the hql where clause to correctly apply the id of the table + DESC order diffstat: src-db/database/model/tables/FACT_ACCT.xml | 1 + src-db/database/sourcedata/AD_TAB.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 287f17e68880 -r 646304f60e8f src-db/database/model/tables/FACT_ACCT.xml --- a/src-db/database/model/tables/FACT_ACCT.xmlTue Sep 25 12:16:03 2018 + +++ b/src-db/database/model/tables/FACT_ACCT.xmlTue Sep 25 16:47:57 2018 +0200 @@ -301,6 +301,7 @@ + diff -r 287f17e68880 -r 646304f60e8f src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Tue Sep 25 12:16:03 2018 + +++ b/src-db/database/sourcedata/AD_TAB.xml Tue Sep 25 16:47:57 2018 +0200 @@ -3022,7 +3022,7 @@ - + ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/main: 9 new changesets
details: https://code.openbravo.com/erp/devel/main/rev/ae5338494af6 changeset: 34787:ae5338494af6 user: Javier Armendáriz openbravo.com> date: Wed Sep 12 19:08:49 2018 +0200 summary: Fixed issue 39261: Connection leak when printing image on subreports. Adding a boolean flag to getImageLogoObject to add the possibility to commit and close the connection once a logo image is retrieved. details: https://code.openbravo.com/erp/devel/main/rev/7ebcdd2bf2c5 changeset: 34788:7ebcdd2bf2c5 user: Javier Armendáriz openbravo.com> date: Fri Sep 21 09:28:48 2018 +0200 summary: Fixed issue 39201: Menu overlapped by messageBar if receiving a response from a closed window. Instead of dissapearing, the menu were overlapped with a error messageBar which originally belonged to the window that made the request (and were closed before it finishes). This fix ensures the datasource window is not currently destroyed to show the error message. details: https://code.openbravo.com/erp/devel/main/rev/cf547a60259c changeset: 34789:cf547a60259c user: Atul Gaware openbravo.com> date: Wed Sep 19 19:33:01 2018 +0530 summary: Related to Issue 0039296:Sample data (F International Group Client) for 3.0PR18Q4 Committed changes prior to creating transactions for sample data for 3.0PR18Q4 details: https://code.openbravo.com/erp/devel/main/rev/17a5d4818c4f changeset: 34790:17a5d4818c4f user: Atul Gaware openbravo.com> date: Thu Sep 20 01:28:22 2018 +0530 summary: Fixes Issue 39296:Sample data (F International Group Client) for 3.0PR18Q4 Sample data (F International Group Client) for 3.0PR18Q4 for the month of July, August and Sept 2018. Following the "How to evolve F" document instructions transactions created for 3.0PR18Q4 release. details: https://code.openbravo.com/erp/devel/main/rev/59a0e798d44c changeset: 34791:59a0e798d44c user: RM packaging bot openbravo.com> date: Fri Sep 21 11:05:53 2018 + summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/a7149d379ac1 changeset: 34792:a7149d379ac1 user: Javier Armendáriz openbravo.com> date: Mon Sep 24 10:25:19 2018 +0200 summary: Fixed issue 38159: Memory leak in referenced inventory unbox process The leak is caused by an invalid call of fireOnPause method on selector with a targetRecordId (when clicking from the looking glass icon of a field). This call gives an invalid delay value that causes the timeout to be called indefinitely. details: https://code.openbravo.com/erp/devel/main/rev/18826c3cd89b changeset: 34793:18826c3cd89b user: Mark gmail.com> date: Thu Sep 20 14:31:38 2018 -0400 summary: Fixed issue 39333: Use the order date instead of system date when order lines related to discounts are created. When an order line related to a discount was created it was using the system date as it ordered date instead of the header's ordered date. Now it is set the ordered date of the header as it ordered date. details: https://code.openbravo.com/erp/devel/main/rev/8a73e458127f changeset: 34794:8a73e458127f user: Javier Armendáriz openbravo.com> date: Tue Sep 25 09:59:27 2018 +0200 summary: Related to issue 39261: Connection leak when printing image on subreports. Moved connection close to getImageLogo to avoid errors trying to fetch image binary data from a closed connection. details: https://code.openbravo.com/erp/devel/main/rev/c4e1d4ba022d changeset: 34795:c4e1d4ba022d user: RM packaging bot openbravo.com> date: Tue Sep 25 12:00:45 2018 + summary: CI: update AD_MODULE to version 34794 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 4 +-
[OpenbravoERP-commits] devel/pi: Related to issue 38173: Using parameter instead of str...
details: https://code.openbravo.com/erp/devel/pi/rev/e63c07dcad18
changeset: 34800:e63c07dcad18
user: Javier Armendáriz openbravo.com>
date: Tue Sep 25 13:02:24 2018 +0200
summary: Related to issue 38173: Using parameter instead of string
replacement in query
diffstat:
src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java
| 9 ++---
1 files changed, 6 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r b378ec3feb51 -r e63c07dcad18
src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java
---
a/src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java
Tue Sep 25 11:04:15 2018 +0200
+++
b/src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java
Tue Sep 25 13:02:24 2018 +0200
@@ -23,6 +23,7 @@
import java.util.List;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
import org.openbravo.base.provider.OBProvider;
import org.openbravo.client.application.OBUIAPPViewImplementation;
import org.openbravo.client.application.ViewRoleAccess;
@@ -1224,10 +1225,12 @@
StringBuilder delete = new StringBuilder();
delete.append(" delete from " + OBUIAPPViewImplementation.ENTITY_NAME);
- delete.append(" where " + OBUIAPPViewImplementation.PROPERTY_NAME + " =
'%s'");
+ delete.append(" where " + OBUIAPPViewImplementation.PROPERTY_NAME + " =
:name");
- OBDal.getInstance().getSession()
- .createQuery(String.format(delete.toString(),
DUMMY_VIEW_IMPL_NAME)).executeUpdate();
+ @SuppressWarnings("rawtypes")
+ Query query =
OBDal.getInstance().getSession().createQuery(delete.toString());
+ query.setParameter("name", DUMMY_VIEW_IMPL_NAME);
+ query.executeUpdate();
module.setInDevelopment(currentState);
OBDal.getInstance().save(module);
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 39332: Fix typo
details: https://code.openbravo.com/erp/devel/pi/rev/b378ec3feb51
changeset: 34799:b378ec3feb51
user: Carlos Aristu openbravo.com>
date: Tue Sep 25 11:04:15 2018 +0200
summary: related to issue 39332: Fix typo
diffstat:
src-test/src/org/openbravo/test/model/DBModifiedTest.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 293ffdd59d35 -r b378ec3feb51
src-test/src/org/openbravo/test/model/DBModifiedTest.java
--- a/src-test/src/org/openbravo/test/model/DBModifiedTest.java Tue Sep 25
10:42:56 2018 +0200
+++ b/src-test/src/org/openbravo/test/model/DBModifiedTest.java Tue Sep 25
11:04:15 2018 +0200
@@ -50,7 +50,7 @@
createDBObject();
assertTrue("DB changes were not detected", isDBModified(true));
- assertFalse("DB changes were detected just after upating check sum in
DB",
+ assertFalse("DB changes were detected just after updating check sum in
DB",
isDBModified(false));
} finally {
dropDBObject();
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: Related to issue 39201: Updated copyright year
details: https://code.openbravo.com/erp/devel/pi/rev/293ffdd59d35 changeset: 34798:293ffdd59d35 user: Javier Armendáriz openbravo.com> date: Tue Sep 25 10:42:56 2018 +0200 summary: Related to issue 39201: Updated copyright year diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8432ac92f307 -r 293ffdd59d35 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Tue Sep 25 10:27:13 2018 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Tue Sep 25 10:42:56 2018 +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-2017 Openbravo SLU + * All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): __. ___ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: related to issue 39261: update javadoc information
details: https://code.openbravo.com/erp/devel/pi/rev/8432ac92f307
changeset: 34797:8432ac92f307
user: Carlos Aristu openbravo.com>
date: Tue Sep 25 10:27:13 2018 +0200
summary: related to issue 39261: update javadoc information
diffstat:
src/org/openbravo/erpCommon/utility/Utility.java | 18 +++---
1 files changed, 11 insertions(+), 7 deletions(-)
diffs (70 lines):
diff -r 45a672248561 -r 8432ac92f307
src/org/openbravo/erpCommon/utility/Utility.java
--- a/src/org/openbravo/erpCommon/utility/Utility.java Fri Sep 21 11:34:01
2018 +0200
+++ b/src/org/openbravo/erpCommon/utility/Utility.java Tue Sep 25 10:27:13
2018 +0200
@@ -2084,7 +2084,7 @@
}
/**
- * Provides the image as a BufferedImage object.
+ * Provides the image as a BufferedImage object. Commonly used for reports.
*
* @param id
* The id of the image to display
@@ -2104,7 +2104,8 @@
*
* @param logo
* The name of the logo to display This can be one of the
following: yourcompanylogin,
- * youritservicelogin, yourcompanymenu, yourcompanybig or
yourcompanydoc
+ * youritservicelogin, yourcompanymenu, yourcompanybig,
yourcompanydoc, yourcompanylegal
+ * or banner-production
* @param org
* The organization id used to get the logo In the case of
requesting the yourcompanydoc
* logo you can indicate the organization used to request the logo.
@@ -2187,7 +2188,8 @@
*
* @param logo
* The name of the logo to display This can be one of the
following: yourcompanylogin,
- * youritservicelogin, yourcompanymenu, yourcompanybig or
yourcompanydoc
+ * youritservicelogin, yourcompanymenu, yourcompanybig,
yourcompanydoc, yourcompanylegal
+ * or banner-production
* @param org
* The organization id used to get the logo In the case of
requesting the yourcompanydoc
* logo you can indicate the organization used to request the logo.
@@ -2202,7 +2204,8 @@
*
* @param logo
* The name of the logo to display This can be one of the
following: yourcompanylogin,
- * youritservicelogin, yourcompanymenu, yourcompanybig or
yourcompanydoc
+ * youritservicelogin, yourcompanymenu, yourcompanybig,
yourcompanydoc, yourcompanylegal
+ * or banner-production
* @param org
* The organization id used to get the logo In the case of
requesting the yourcompanydoc
* logo you can indicate the organization used to request the logo.
@@ -2249,7 +2252,8 @@
*
* @param logo
* The name of the logo to display This can be one of the
following: yourcompanylogin,
- * youritservicelogin, yourcompanymenu, yourcompanybig or
yourcompanydoc
+ * youritservicelogin, yourcompanymenu, yourcompanybig,
yourcompanydoc, yourcompanylegal
+ * or banner-production
* @return The path of the image requested
*/
private static String getDefaultImageLogoPath(String logo) {
@@ -2377,7 +2381,7 @@
}
/**
- * Provides the image logo as a BufferedImage object.
+ * Provides the image logo as a BufferedImage object. Commonly used for
reports.
*
* @param logo
* The name of the logo to display
@@ -2390,7 +2394,7 @@
}
/**
- * Provides the image logo as a BufferedImage object.
+ * Provides the image logo as a BufferedImage object. Commonly used for
reports.
*
* @param logo
* The name of the logo to display
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
[OpenbravoERP-commits] devel/pi: 2 new changesets
details: https://code.openbravo.com/erp/devel/pi/rev/462eab118a3b
changeset: 34795:462eab118a3b
user: Asier Lostalé openbravo.com>
date: Fri Sep 21 11:26:50 2018 +0200
summary: fixed bug 39332: PG 11: ad_db_modified function fails
AD_DB_MODIFIED was failing in PG 11 because it was using pg_proc.proisagg
column which does no longer exist starting from 11.
Using that column was unneeded in any case because it was in query to get
paramaters and it was filtering out functions using them, as those functions
where already obtained in outer query, it is not needed to filter them again.
details: https://code.openbravo.com/erp/devel/pi/rev/45a672248561
changeset: 34796:45a672248561
user: Asier Lostalé openbravo.com>
date: Fri Sep 21 11:34:01 2018 +0200
summary: related to bug 39332: PG 11: ad_db_modified function fails
Added test cases covering ad_db_modified
diffstat:
src-db/database/model/prescript-PostgreSql.sql| 3 +-
src-test/src/org/openbravo/test/AllAntTaskTests.java | 4 +-
src-test/src/org/openbravo/test/model/DBModifiedTest.java | 97 +++
3 files changed, 101 insertions(+), 3 deletions(-)
diffs (142 lines):
diff -r 8a73e458127f -r 45a672248561
src-db/database/model/prescript-PostgreSql.sql
--- a/src-db/database/model/prescript-PostgreSql.sqlTue Sep 25 09:59:27
2018 +0200
+++ b/src-db/database/model/prescript-PostgreSql.sqlFri Sep 21 11:34:01
2018 +0200
@@ -1289,7 +1289,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) 2009 Openbravo SLU
+* All portions are Copyright (C) 2009-2018 Openbravo SLU
* All Rights Reserved.
* Contributor(s): __.
/
@@ -1338,7 +1338,6 @@
WHERE pg_proc.prorettype <> 'pg_catalog.cstring'::pg_catalog.regtype
AND (pg_proc.proargtypes[0] IS NULL
OR pg_proc.proargtypes[0] <>
'pg_catalog.cstring'::pg_catalog.regtype)
-AND NOT pg_proc.proisagg
AND pg_catalog.pg_function_is_visible(pg_proc.oid)
AND pg_proc.proname = i.realname
and pg_proc.pronargs = i.pronargs
diff -r 8a73e458127f -r 45a672248561
src-test/src/org/openbravo/test/AllAntTaskTests.java
--- a/src-test/src/org/openbravo/test/AllAntTaskTests.java Tue Sep 25
09:59:27 2018 +0200
+++ b/src-test/src/org/openbravo/test/AllAntTaskTests.java Fri Sep 21
11:34:01 2018 +0200
@@ -74,6 +74,7 @@
import org.openbravo.test.inventoryStatus.InventoryStatusTest;
import
org.openbravo.test.materialMgmt.iscompletelyinvoicedshipment.IsCompletelyInvoicedShipment;
import org.openbravo.test.model.ClassLoaderTest;
+import org.openbravo.test.model.DBModifiedTest;
import org.openbravo.test.model.IndexesTest;
import org.openbravo.test.model.OneToManyTest;
import org.openbravo.test.model.RuntimeModelTest;
@@ -175,7 +176,8 @@
ClassLoaderTest.class, //
IndexesTest.class, //
TrlColumnsOraTypeTest.class, //
-ADCSInitialization.class,
+ADCSInitialization.class, //
+DBModifiedTest.class,
// modularity
DatasetServiceTest.class, //
diff -r 8a73e458127f -r 45a672248561
src-test/src/org/openbravo/test/model/DBModifiedTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/src-test/src/org/openbravo/test/model/DBModifiedTest.java Fri Sep 21
11:34:01 2018 +0200
@@ -0,0 +1,97 @@
+/*
+ *
+ * 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) 2018 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): __.
+
+ */
+
+package org.openbravo.test.model;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.test.base.OBBaseTest;
+
+/** Test cases covering detection of DB model changes */
+public class DBModifiedTest extends OBBaseTest {
+
+ @Test
+ public void noChangesTest() {
+assertFalse("DB changes
[OpenbravoERP-commits] devel/pi: Related to issue 39261: Connection leak when printing ...
details: https://code.openbravo.com/erp/devel/pi/rev/8a73e458127f
changeset: 34794:8a73e458127f
user: Javier Armendáriz openbravo.com>
date: Tue Sep 25 09:59:27 2018 +0200
summary: Related to issue 39261: Connection leak when printing image on
subreports.
Moved connection close to getImageLogo to avoid errors trying to fetch image
binary data from a closed connection.
diffstat:
src/org/openbravo/erpCommon/utility/Utility.java | 35 ++-
1 files changed, 10 insertions(+), 25 deletions(-)
diffs (80 lines):
diff -r 18826c3cd89b -r 8a73e458127f
src/org/openbravo/erpCommon/utility/Utility.java
--- a/src/org/openbravo/erpCommon/utility/Utility.java Thu Sep 20 14:31:38
2018 -0400
+++ b/src/org/openbravo/erpCommon/utility/Utility.java Tue Sep 25 09:59:27
2018 +0200
@@ -58,9 +58,6 @@
import javax.imageio.ImageIO;
import javax.servlet.ServletException;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JasperReport;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -96,6 +93,9 @@
import org.openbravo.utils.FileUtility;
import org.openbravo.utils.FormatUtilities;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperReport;
+
/**
* @author Fernando Iriazabal
*
@@ -2112,24 +2112,6 @@
* @return The image requested
*/
public static Image getImageLogoObject(String logo, String org) {
-return getImageLogoObject(logo, org, false);
- }
-
- /**
- * Provides the image logo as a byte array for the indicated parameters.
- *
- * @param logo
- * The name of the logo to display This can be one of the
following: yourcompanylogin,
- * youritservicelogin, yourcompanymenu, yourcompanybig or
yourcompanydoc
- * @param org
- * The organization id used to get the logo In the case of
requesting the yourcompanydoc
- * logo you can indicate the organization used to request the logo.
- * @param doConnectionClose
- * A flag to force the close of the DAL connection after retrieving
the image
- *
- * @return The image requested
- */
- private static Image getImageLogoObject(String logo, String org, boolean
doConnectionClose) {
Image img = null;
OBContext.setAdminMode();
try {
@@ -2196,9 +2178,6 @@
log4j.error("Could not load logo from database: " + logo + ", " + org,
e);
} finally {
OBContext.restorePreviousMode();
- if (doConnectionClose) {
-OBDal.getReadOnlyInstance().commitAndClose();
- }
}
return img;
}
@@ -2235,7 +2214,7 @@
byte[] imageByte;
try {
- Image img = getImageLogoObject(logo, org, doConnectionClose);
+ Image img = getImageLogoObject(logo, org);
if (img == null) {
String path = getDefaultImageLogoPath(logo);
ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -2255,6 +2234,12 @@
} catch (Exception e) {
log4j.error("Could not load logo from database: " + logo + ", " + org,
e);
imageByte = getBlankImage();
+} finally {
+ if (doConnectionClose) {
+// Closing read-only instance connection because this is the
connection used by
+// getImageLogoObject
+OBDal.getReadOnlyInstance().commitAndClose();
+ }
}
return imageByte;
}
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
