[OpenbravoERP-commits] devel/pi: 2 new changesets

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/74c0f9194e1f
changeset: 29905:74c0f9194e1f
user:  RM packaging bot  openbravo.com>
date:  Thu Aug 25 02:50:19 2016 +
summary:   CI: update AD_MODULE to version 29904

details:   https://code.openbravo.com/erp/devel/pi/rev/d7261e0b3656
changeset: 29906:d7261e0b3656
user:  RM packaging bot  openbravo.com>
date:  Thu Aug 25 03:04:09 2016 +
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: 3 new changesets

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/main/rev/d4a6d6f4b672
changeset: 29903:d4a6d6f4b672
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 20:46:44 2016 +
summary:   CI: merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/bbfb9204dbb7
changeset: 29904:bbfb9204dbb7
user:  Rafael Queralta Pozo  nauta.cu>
date:  Wed Aug 24 14:54:57 2016 -0400
summary:   Fixes issue 33636: Error should be raised when running "Modify 
Payment Plan"

Now "The invoice is already included in a Remittance." message is shown when 
running Modify Payment Plan process from an invoice included in a remittance.

details:   https://code.openbravo.com/erp/devel/main/rev/74c0f9194e1f
changeset: 29905:74c0f9194e1f
user:  RM packaging bot  openbravo.com>
date:  Thu Aug 25 02:50:19 2016 +
summary:   CI: update AD_MODULE to version 29904

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml 
 |  12 +
 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.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java
 |  11 -
 
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 +-
 

[OpenbravoERP-commits] devel/pi: Fixes issue 33636: Error should be raised when running...

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/bbfb9204dbb7
changeset: 29904:bbfb9204dbb7
user:  Rafael Queralta Pozo  nauta.cu>
date:  Wed Aug 24 14:54:57 2016 -0400
summary:   Fixes issue 33636: Error should be raised when running "Modify 
Payment Plan"

Now "The invoice is already included in a Remittance." message is shown when 
running Modify Payment Plan process from an invoice included in a remittance.

diffstat:

 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml 
 |  12 ++
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java
 |  11 -
 2 files changed, 22 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r d4a6d6f4b672 -r bbfb9204dbb7 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Aug 24 20:46:44 2016 +
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Aug 24 14:54:57 2016 -0400
@@ -96,6 +96,18 @@
   

 
 
+
+  

+  

+  
+  
+  

+  
+  
+  

+  

+
+
 
   

   

diff -r d4a6d6f4b672 -r bbfb9204dbb7 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java
   Wed Aug 24 20:46:44 2016 +
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java
   Wed Aug 24 14:54:57 2016 -0400
@@ -120,7 +120,16 @@
   OBDal.getInstance().rollbackAndClose();
   log4j.error("Exception! " + e);
   String constraint = e.getConstraintName();
-  constraint = constraint.substring(constraint.lastIndexOf(".") + 1, 
constraint.length());
+  if (StringUtils.isNotEmpty(constraint)) {
+constraint = constraint.substring(constraint.lastIndexOf(".") + 1, 
constraint.length());
+  } else {
+constraint = e.getSQLException().getNextException().getMessage();
+constraint = constraint.substring(constraint.lastIndexOf("constraint") 
+ 12,
+constraint.lastIndexOf("on table") - 2);
+if (!constraint.startsWith("APRM")) {
+  constraint = "APRM" + constraint.substring(constraint.indexOf("_"));
+}
+  }
   try {
 return addMessage(jsonRequest, "@" + constraint + "@", "error");
   } catch (Exception ex) {

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: 2 new changesets

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/badbe5df5566
changeset: 29902:badbe5df5566
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 20:32:36 2016 +
summary:   CI: update AD_MODULE to version 29901

details:   https://code.openbravo.com/erp/devel/pi/rev/d4a6d6f4b672
changeset: 29903:d4a6d6f4b672
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 20:46:44 2016 +
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: 11 new changesets

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/main/rev/3d8d5b58f0ec
changeset: 29892:3d8d5b58f0ec
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 11:08:58 2016 +0200
summary:   Fixed 33789. Avoid accidental double query by not calling .list() 
twice

details:   https://code.openbravo.com/erp/devel/main/rev/c35e5b050f0b
changeset: 29893:c35e5b050f0b
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 11:54:52 2016 +0200
summary:   Fixed 33790. Avoid double query with .count() + .list(). Add limit 1 
to query

Query did .count() + then retrieve 1 record after adding extra order by.

This change removes the count as it only adds extra overhead and directly
does the real .list() query.
As the code only uses single row of result add extra limit 1 to reduce
number of result rows loaded into memory if many match the filter.
Simply code to use .uniqueResult() instead of .list().get(0)

details:   https://code.openbravo.com/erp/devel/main/rev/e508c5662e33
changeset: 29894:e508c5662e33
user:  Stefan Hühner  openbravo.com>
date:  Tue Aug 23 17:34:51 2016 +0200
summary:   Fixed 33773. Avoid double query by not calling .list() twice

First case reading from ad_language can be simplified to single .uniqueResult
call as filters are unique.

2nd case just saves list() result to avoid 2nd call easily.

details:   https://code.openbravo.com/erp/devel/main/rev/af6e72d059cd
changeset: 29895:af6e72d059cd
user:  Stefan Hühner  openbravo.com>
date:  Tue Aug 23 17:58:45 2016 +0200
summary:   Fixed 33774. Fixed accidental double query by not calling .list() 
twice

details:   https://code.openbravo.com/erp/devel/main/rev/197fb66d7cea
changeset: 29896:197fb66d7cea
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 13:51:59 2016 +0200
summary:   Issue 33773. Apply review feedback replace .size() >0 with !isEmpty()

details:   https://code.openbravo.com/erp/devel/main/rev/a8163cc557bb
changeset: 29897:a8163cc557bb
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 13:54:17 2016 +0200
summary:   Issue 33774. Apply review feedback, change .size() > 0 to !isEmpty()

details:   https://code.openbravo.com/erp/devel/main/rev/46f401c6
changeset: 29898:46f401c6
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 14:23:41 2016 +0200
summary:   Fixed 33794. Avoid double .list() call by using .uniqueResult() 
instead.

Code did check for >1 result rows while reading from obserds_datasource.
However as the filter is on the name column and that column has an unique
constraint that case of >1 cannot happen.

So simplify to just call .uniqueResult() removing both .list() calls.

details:   https://code.openbravo.com/erp/devel/main/rev/e23c586b8dbf
changeset: 29899:e23c586b8dbf
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 14:39:03 2016 +0200
summary:   Fixed 33771. Avoid double .list() call to not run query twice.

Old code ran following a OBCriteria
  if (obc.list() == null || obc.list().size() == 0) {

However .list() does not return null as per Hibernate javadoc but empty or
non-empty list (of method raising an exception).

So remove the extra null check to avoid double .list() call.

Also improve .list().size() check slightly by using .list().isEmpty()

Add note that filter is on unique constraint so .list().size()<=1 also

details:   https://code.openbravo.com/erp/devel/main/rev/dc4193b228e5
changeset: 29900:dc4193b228e5
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 12:59:17 2016 +
summary:   CI: merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/a730e671babc
changeset: 29901:a730e671babc
user:  Carlos Aristu  openbravo.com>
date:  Wed Aug 24 15:49:21 2016 +0200
summary:   related to issue 33706: code review improvements

details:   https://code.openbravo.com/erp/devel/main/rev/badbe5df5566
changeset: 29902:badbe5df5566
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 20:32:36 2016 +
summary:   CI: update AD_MODULE to version 29901

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 +-
 

[OpenbravoERP-commits] devel/pi: related to issue 33706: code review improvements

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/a730e671babc
changeset: 29901:a730e671babc
user:  Carlos Aristu  openbravo.com>
date:  Wed Aug 24 15:49:21 2016 +0200
summary:   related to issue 33706: code review improvements

diffstat:

 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
 |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r dc4193b228e5 -r a730e671babc 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
--- 
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
   Wed Aug 24 12:59:17 2016 +
+++ 
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
   Wed Aug 24 15:49:21 2016 +0200
@@ -102,7 +102,7 @@
 Validation validation = param.getValidation();
 if (validation != null) {
   if (validation.getType().equals("HQL_JS")) {
-String validationCode = param.getValidation().getValidationCode();
+String validationCode = validation.getValidationCode();
 String validationHQL = applyFilterExpression(validationCode, sel, 
parameters, request);
 
 if (!StringUtils.isEmpty(validationHQL)) {

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: 2 new changesets

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/3713f446b3f8
changeset: 29899:3713f446b3f8
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 12:45:07 2016 +
summary:   CI: update AD_MODULE to version 29890

details:   https://code.openbravo.com/erp/devel/pi/rev/dc4193b228e5
changeset: 29900:dc4193b228e5
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 12:59:17 2016 +
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.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java
 |   7 +--
 
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 +-
 

[OpenbravoERP-commits] devel/main: 3 new changesets

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/main/rev/6aa489b8d490
changeset: 29889:6aa489b8d490
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 00:56:21 2016 +
summary:   CI: merge back from main

details:   https://code.openbravo.com/erp/devel/main/rev/a064f77cbfb9
changeset: 29890:a064f77cbfb9
user:  Carlos Aristu  openbravo.com>
date:  Wed Aug 24 10:12:12 2016 +0200
summary:   related to issue 33622: apply correct format

details:   https://code.openbravo.com/erp/devel/main/rev/3713f446b3f8
changeset: 29891:3713f446b3f8
user:  RM packaging bot  openbravo.com>
date:  Wed Aug 24 12:45:07 2016 +
summary:   CI: update AD_MODULE to version 29890

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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
 |   7 +-
 
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 +-
 

[OpenbravoERP-commits] devel/pi: Fixed 33771. Avoid double .list() call to not run quer...

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/e23c586b8dbf
changeset: 29898:e23c586b8dbf
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 14:39:03 2016 +0200
summary:   Fixed 33771. Avoid double .list() call to not run query twice.

Old code ran following a OBCriteria
  if (obc.list() == null || obc.list().size() == 0) {

However .list() does not return null as per Hibernate javadoc but empty or
non-empty list (of method raising an exception).

So remove the extra null check to avoid double .list() call.

Also improve .list().size() check slightly by using .list().isEmpty()

Add note that filter is on unique constraint so .list().size()<=1 also

diffstat:

 src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 46f401c6 -r e23c586b8dbf 
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java  Wed Aug 
24 14:23:41 2016 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java  Wed Aug 
24 14:39:03 2016 +0200
@@ -405,7 +405,8 @@
   obc.add(Restrictions.in(FinAccPaymentMethod.PROPERTY_ORGANIZATION + 
".id", OBContext
   
.getOBContext().getOrganizationStructureProvider().getNaturalTree(strOrgId)));
 
-  if (obc.list() == null || obc.list().size() == 0) {
+  // filter is on unique constraint so list().size() <=1 always
+  if (obc.list().isEmpty()) {
 message = Utility.messageBD(this, 
"PaymentmethodNotbelongsFinAccount",
 vars.getLanguage());
   }

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: Fixed 33794. Avoid double .list() call by using .uniqu...

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/46f401c6
changeset: 29897:46f401c6
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 14:23:41 2016 +0200
summary:   Fixed 33794. Avoid double .list() call by using .uniqueResult() 
instead.

Code did check for >1 result rows while reading from obserds_datasource.
However as the filter is on the name column and that column has an unique
constraint that case of >1 cannot happen.

So simplify to just call .uniqueResult() removing both .list() calls.

diffstat:

 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java
 |  7 ++-
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (19 lines):

diff -r a8163cc557bb -r 46f401c6 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java
--- 
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java
  Wed Aug 24 13:54:17 2016 +0200
+++ 
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java
  Wed Aug 24 14:23:41 2016 +0200
@@ -106,13 +106,10 @@
   }
 
   private DataSource getDataSourceFromDataSourceName(String dataSourceName) {
-DataSource dataSource = null;
 final OBCriteria obCriteria = 
OBDal.getInstance().createCriteria(DataSource.class);
 obCriteria.add(Restrictions.eq(DataSource.PROPERTY_NAME, dataSourceName));
-if (!obCriteria.list().isEmpty()) {
-  dataSource = obCriteria.list().get(0);
-}
-return dataSource;
+// obserds_datasource.name has unique constraint
+return (DataSource) obCriteria.uniqueResult();
   }
 
   private DataSource getDataSourceFromTableName(String tableName) {

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: 4 new changesets

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/e508c5662e33
changeset: 29893:e508c5662e33
user:  Stefan Hühner  openbravo.com>
date:  Tue Aug 23 17:34:51 2016 +0200
summary:   Fixed 33773. Avoid double query by not calling .list() twice

First case reading from ad_language can be simplified to single .uniqueResult
call as filters are unique.

2nd case just saves list() result to avoid 2nd call easily.

details:   https://code.openbravo.com/erp/devel/pi/rev/af6e72d059cd
changeset: 29894:af6e72d059cd
user:  Stefan Hühner  openbravo.com>
date:  Tue Aug 23 17:58:45 2016 +0200
summary:   Fixed 33774. Fixed accidental double query by not calling .list() 
twice

details:   https://code.openbravo.com/erp/devel/pi/rev/197fb66d7cea
changeset: 29895:197fb66d7cea
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 13:51:59 2016 +0200
summary:   Issue 33773. Apply review feedback replace .size() >0 with !isEmpty()

details:   https://code.openbravo.com/erp/devel/pi/rev/a8163cc557bb
changeset: 29896:a8163cc557bb
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 13:54:17 2016 +0200
summary:   Issue 33774. Apply review feedback, change .size() > 0 to !isEmpty()

diffstat:

 src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java |  16 
+-
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r c35e5b050f0b -r a8163cc557bb 
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
--- a/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java  
Wed Aug 24 11:54:52 2016 +0200
+++ b/src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java  
Wed Aug 24 13:54:17 2016 +0200
@@ -284,10 +284,8 @@
   public static Language getLanguage(String strLanguage) throws Exception {
 final OBCriteria obcLanguage = 
OBDal.getInstance().createCriteria(Language.class);
 obcLanguage.add(Restrictions.eq(Language.PROPERTY_LANGUAGE, strLanguage));
-if (obcLanguage.list().size() > 0)
-  return obcLanguage.list().get(0);
-else
-  return null;
+// ad_language.ad_language is unique
+return (Language) obcLanguage.uniqueResult();
   }
 
   /**
@@ -1863,8 +1861,9 @@
   obcDataSets.add(Restrictions.eq(DataSet.PROPERTY_MODULE, module));
   obcDataSets.add(Restrictions.in(DataSet.PROPERTY_DATAACCESSLEVEL, 
accessLevel));
   obcDataSets.addOrder(Order.asc(DataSet.PROPERTY_NAME));
-  if (obcDataSets.list().size() > 0) {
-return obcDataSets.list();
+  List listDataSets = obcDataSets.list();
+  if (!listDataSets.isEmpty()) {
+return listDataSets;
   } else {
 return null;
   }
@@ -1887,8 +1886,9 @@
   .createCriteria(org.openbravo.model.ad.domain.List.class);
   
obcRefList.add(Restrictions.eq(org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE,
 OBDal
   .getInstance().get(Reference.class, "181")));
-  if (obcRefList.list().size() > 0) {
-return obcRefList.list();
+  List listRefList = obcRefList.list();
+  if (!listRefList.isEmpty()) {
+return listRefList;
   } else {
 return null;
   }

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: Fixed 33790. Avoid double query with .count() + .list(...

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/c35e5b050f0b
changeset: 29892:c35e5b050f0b
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 11:54:52 2016 +0200
summary:   Fixed 33790. Avoid double query with .count() + .list(). Add limit 1 
to query

Query did .count() + then retrieve 1 record after adding extra order by.

This change removes the count as it only adds extra overhead and directly
does the real .list() query.
As the code only uses single row of result add extra limit 1 to reduce
number of result rows loaded into memory if many match the filter.
Simply code to use .uniqueResult() instead of .list().get(0)

diffstat:

 src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java |  
8 +++-
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (18 lines):

diff -r 3d8d5b58f0ec -r c35e5b050f0b 
src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java
--- 
a/src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java
Wed Aug 24 11:08:58 2016 +0200
+++ 
b/src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java
Wed Aug 24 11:54:52 2016 +0200
@@ -127,11 +127,9 @@
 PriceListVersion.class);
 plVersionCrit.add(Restrictions.eq(PriceListVersion.PROPERTY_PRICELIST, 
priceList));
 plVersionCrit.add(Restrictions.le(PriceListVersion.PROPERTY_VALIDFROMDATE, 
date));
-if (plVersionCrit.count() > 0) {
-  plVersionCrit.addOrderBy(PriceListVersion.PROPERTY_VALIDFROMDATE, false);
-  return plVersionCrit.list().get(0);
-}
-return null;
+plVersionCrit.addOrderBy(PriceListVersion.PROPERTY_VALIDFROMDATE, false);
+plVersionCrit.setMaxResults(1);
+return (PriceListVersion) plVersionCrit.uniqueResult();
   }
 
   private boolean isSalesTransaction() {

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: Fixed 33789. Avoid accidental double query by not call...

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/3d8d5b58f0ec
changeset: 29891:3d8d5b58f0ec
user:  Stefan Hühner  openbravo.com>
date:  Wed Aug 24 11:08:58 2016 +0200
summary:   Fixed 33789. Avoid accidental double query by not calling .list() 
twice

diffstat:

 src/org/openbravo/service/db/CallProcess.java |  6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r a064f77cbfb9 -r 3d8d5b58f0ec 
src/org/openbravo/service/db/CallProcess.java
--- a/src/org/openbravo/service/db/CallProcess.java Wed Aug 24 10:12:12 
2016 +0200
+++ b/src/org/openbravo/service/db/CallProcess.java Wed Aug 24 11:08:58 
2016 +0200
@@ -25,6 +25,7 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -85,12 +86,13 @@
 .createCriteria(org.openbravo.model.ad.ui.Process.class);
 
processCriteria.add(Restrictions.eq(org.openbravo.model.ad.ui.Process.PROPERTY_PROCEDURE,
 processName));
-if (processCriteria.list().size() != 1) {
+List processList = 
processCriteria.list();
+if (processList.size() != 1) {
   throw new OBException("No process or more than one process found using 
procedurename "
   + processName);
 
 }
-return call(processCriteria.list().get(0), recordID, parameters, doCommit);
+return call(processList.get(0), recordID, parameters, doCommit);
   }
 
   /**

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits


[OpenbravoERP-commits] devel/pi: related to issue 33622: apply correct format

2016-08-24 Thread hg
details:   https://code.openbravo.com/erp/devel/pi/rev/a064f77cbfb9
changeset: 29890:a064f77cbfb9
user:  Carlos Aristu  openbravo.com>
date:  Wed Aug 24 10:12:12 2016 +0200
summary:   related to issue 33622: apply correct format

diffstat:

 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
 |  7 +++
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r 6aa489b8d490 -r a064f77cbfb9 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
--- 
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
 Wed Aug 24 00:56:21 2016 +
+++ 
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
 Wed Aug 24 10:12:12 2016 +0200
@@ -674,8 +674,8 @@
* Returns the value for a FK property, in case the entity of the row is the 
referencedEntity for
* that FK, it returns the row id.
*/
-  private Object getFKValue(JSONObject row, String propertyName,
-  String referencedEntityName) throws JSONException {
+  private Object getFKValue(JSONObject row, String propertyName, String 
referencedEntityName)
+  throws JSONException {
 Object value = null;
 if (row.has(propertyName)) {
   value = row.get(propertyName);
@@ -844,8 +844,7 @@
 final List refreshedBobs = new ArrayList();
 for (BaseOBObject bob : bobs) {
   // forcing fetch from DB
-  BaseOBObject refreshedBob = 
OBDal.getInstance().get(bob.getEntityName(),
-  bob.getId());
+  BaseOBObject refreshedBob = 
OBDal.getInstance().get(bob.getEntityName(), bob.getId());
 
   // if object has computed columns refresh from the database too
   if (refreshedBob.getEntity().hasComputedColumns()) {

--
___
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits