details:   https://code.openbravo.com/erp/devel/pi/rev/1da28cdc2091
changeset: 29371:1da28cdc2091
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Apr 21 09:11:09 2016 +0200
summary:   [cu] fixed typos

details:   https://code.openbravo.com/erp/devel/pi/rev/49905872d602
changeset: 29372:49905872d602
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Apr 21 14:12:13 2016 +0200
summary:   [cu] all session types are counted for CU, but the ones maintained 
as special

details:   https://code.openbravo.com/erp/devel/pi/rev/64ceb61b33bc
changeset: 29373:64ceb61b33bc
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Apr 21 14:18:40 2016 +0200
summary:   [cu] count active sessions only in case session type counts CU

details:   https://code.openbravo.com/erp/devel/pi/rev/53d835e0ab9b
changeset: 29374:53d835e0ab9b
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Apr 21 15:06:51 2016 +0200
summary:   [cu] limited list of no CU session types

details:   https://code.openbravo.com/erp/devel/pi/rev/05d354c58009
changeset: 29375:05d354c58009
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Apr 21 15:07:33 2016 +0200
summary:   [cu] comments on license types

details:   https://code.openbravo.com/erp/devel/pi/rev/809ab47003f5
changeset: 29376:809ab47003f5
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Apr 21 15:12:49 2016 +0200
summary:   [cu] expose session types cosuming CU

details:   https://code.openbravo.com/erp/devel/pi/rev/4cf291f8c905
changeset: 29377:4cf291f8c905
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Apr 21 15:24:45 2016 +0200
summary:   [cu] Openbravo landing page resets session type to stadard S

  In case the session was created for a type that does not count concurrent
  users, its type is changed so from now on it will start counting.

details:   https://code.openbravo.com/erp/devel/pi/rev/5a149b19cfa6
changeset: 29378:5a149b19cfa6
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu Apr 21 15:36:17 2016 +0200
summary:   [cu] replace magic numbers with constants

details:   https://code.openbravo.com/erp/devel/pi/rev/4b97a92c03e3
changeset: 29379:4b97a92c03e3
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Apr 22 11:41:13 2016 +0200
summary:   [cu] check CU limit when moving to backend if session didn't count 
CU before

details:   https://code.openbravo.com/erp/devel/pi/rev/235e96159922
changeset: 29380:235e96159922
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Apr 22 11:49:25 2016 +0200
summary:   [cu] clutter

details:   https://code.openbravo.com/erp/devel/pi/rev/e934a41e4f2c
changeset: 29381:e934a41e4f2c
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Apr 22 13:09:52 2016 +0200
summary:   [cu] don't kick out not abandoned mobile sessions

  When CU limit is reached, abandoned sessions are tried to be kicked out before
  preventing new session login. This was done assuming sessions are constantly
  pinging backed, which is the case of backoffice applications but not for 
mobile
  ones.

  In addition to that mechanism, before removing a abandoned session, now it is 
also
  checked it last request. In order to implement it, a list of alive sessions 
is centrally
  maintained in SessionListener.

  Note ping has not disabled because it detects possible sessions created in a 
different
  JVM, which is not the case for this new mechanism.

details:   https://code.openbravo.com/erp/devel/pi/rev/42ec5ebb1b2f
changeset: 29382:42ec5ebb1b2f
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Apr 22 13:25:31 2016 +0200
summary:   [cu] javadoc

details:   https://code.openbravo.com/erp/devel/pi/rev/b616bd2968cb
changeset: 29383:b616bd2968cb
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon Apr 25 10:03:23 2016 +0200
summary:   [cu] do not include null in session query

details:   https://code.openbravo.com/erp/devel/pi/rev/a0a02895c6bf
changeset: 29384:a0a02895c6bf
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon Apr 25 10:46:58 2016 +0200
summary:   [cu] pi merge

details:   https://code.openbravo.com/erp/devel/pi/rev/e6fc61cc0001
changeset: 29385:e6fc61cc0001
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon Apr 25 10:57:48 2016 +0200
summary:   [cu] javadoc for new param

details:   https://code.openbravo.com/erp/devel/pi/rev/dafb9b081971
changeset: 29386:dafb9b081971
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon Apr 25 11:52:11 2016 +0200
summary:   [cu] don't use Vector to syncrhonize

  Using Set and define explicit synchronized blocks

details:   https://code.openbravo.com/erp/devel/pi/rev/4ede20870f22
changeset: 29387:4ede20870f22
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon May 02 09:54:43 2016 +0200
summary:   [cu] typo

details:   https://code.openbravo.com/erp/devel/pi/rev/fb0b1e5d3ab2
changeset: 29388:fb0b1e5d3ab2
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon May 02 10:36:57 2016 +0200
summary:   [cu] bypass CU checking for forced login

details:   https://code.openbravo.com/erp/devel/pi/rev/69c538ce364d
changeset: 29389:69c538ce364d
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon May 02 10:39:29 2016 +0200
summary:   [cu] removes duplication: added new public method to get login URL

details:   https://code.openbravo.com/erp/devel/pi/rev/b39074682dca
changeset: 29390:b39074682dca
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon May 02 11:06:25 2016 +0200
summary:   fixes 32821: Mobile Core. Reinforce CU Licensing

diffstat:

 .settings/org.eclipse.jdt.core.prefs                                           
                                                    |    1 -
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml 
                                                    |   14 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
                                              |   40 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
                                               |    2 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
                   |   13 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
               |    8 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpression.java
      |    3 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java
     |    6 +-
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js
                                 |    5 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java
                        |    6 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/CachedPreference.java
                                |    3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java
            |    3 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
                              |    2 +
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/SetContextInfoActionHandler.java
                               |   66 -
 
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
                                 |   52 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
 |  314 +--
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_REF_LIST.xml
                                                |   12 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java
                           |   78 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ComboTableDatasourceService.java
                     |   29 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceConstants.java
                             |    5 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceService.java
                               |   28 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
                               |   22 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java
                            |   15 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/NoteDataSource.java
                                  |  107 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java
                           |   30 +-
 
modules/org.openbravo.service.json/src-test/org/openbravo/service/json/test/DataQueryServiceTest.java
                              |    8 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
                                        |    4 +
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DataEntityQueryService.java
                                      |    8 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonDataService.java
                                             |    3 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/QueryBuilder.java
                                                |  737 ----------
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
           |    2 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
                |    7 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorFieldPropertyDataSource.java
         |   19 +-
 src-db/database/lib/dbsourcemanager.jar                                        
                                                    |    0 
 src-db/database/model/functions/MA_PRODUCTION_COST.xml                         
                                                    |   14 +-
 src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml                   
                                                    |    6 +-
 src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml                  
                                                    |    6 +-
 src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml                       
                                                    |   13 +-
 src-db/database/sourcedata/AD_COLUMN.xml                                       
                                                    |    5 +-
 src-db/database/sourcedata/AD_ELEMENT.xml                                      
                                                    |    5 +-
 src-db/database/sourcedata/AD_FIELD.xml                                        
                                                    |    7 +-
 src-db/database/sourcedata/AD_REF_LIST.xml                                     
                                                    |   18 +-
 src-db/database/sourcedata/OBUIAPP_PROCESS.xml                                 
                                                    |    3 +-
 src-test/src/org/openbravo/test/AllAntTaskTests.java                           
                                                    |    2 +
 src-test/src/org/openbravo/test/AllWebserviceTests.java                        
                                                    |    6 +-
 src-test/src/org/openbravo/test/base/OBBaseTest.java                           
                                                    |   13 +
 src-test/src/org/openbravo/test/datasource/DataSourceSecurity.java             
                                                    |  400 +++++
 src-test/src/org/openbravo/test/datasource/DataSourceWhereParameter.java       
                                                    |    3 +-
 src-test/src/org/openbravo/test/datasource/ProductSelectorDataSourceTest.java  
                                                    |    3 +
 
src-test/src/org/openbravo/test/datasource/TestAllowUnpagedDatasourcePreference.java
                                               |   12 +-
 src-test/src/org/openbravo/test/datasource/TestComboDatasource.java            
                                                    |    8 +-
 src-test/src/org/openbravo/test/security/BypassAccessLevelCheck.java           
                                                    |   93 +
 src-test/src/org/openbravo/test/security/CrossOrganizationReference.java       
                                                    |    1 +
 
src-test/src/org/openbravo/test/security/ExplicitCrossOrganizationReference.java
                                                   |   32 +-
 src/index.jsp                                                                  
                                                    |   42 +
 src/org/openbravo/authentication/AuthenticationManager.java                    
                                                    |   24 +-
 src/org/openbravo/base/model/ModelProvider.java                                
                                                    |   16 +-
 src/org/openbravo/base/secureApp/HttpSecureAppServlet.java                     
                                                    |    4 +
 src/org/openbravo/base/secureApp/LoginHandler.java                             
                                                    |    8 +-
 src/org/openbravo/base/secureApp/LoginUtils.java                               
                                                    |   13 +
 src/org/openbravo/common/datasource/ResultMapCriteriaUtils.java                
                                                    |  520 -------
 src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java 
                                                    |   16 +-
 src/org/openbravo/dal/core/OBContext.java                                      
                                                    |   15 +
 src/org/openbravo/dal/security/EntityAccessChecker.java                        
                                                    |  299 +++-
 src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.html           
                                                    |   37 +-
 src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports.java           
                                                    |   14 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html                
                                                    |   33 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java                
                                                    |   20 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html         
                                                    |   32 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java         
                                                    |   17 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html                 
                                                    |   31 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java                 
                                                    |   15 +-
 src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java               
                                                    |   12 +-
 src/org/openbravo/erpCommon/obps/ActivationKey.java                            
                                                    |   84 +-
 src/org/openbravo/erpCommon/security/SessionListener.java                      
                                                    |   52 +-
 src/org/openbravo/erpCommon/utility/OBLedgerUtils.java                         
                                                    |  114 +
 src/org/openbravo/materialmgmt/ManageVariantsDS.java                           
                                                    |   17 +-
 src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java                   
                                                    |   17 +-
 src/org/openbravo/server/ServerControllerHandler.java                          
                                                    |    9 +-
 79 files changed, 2015 insertions(+), 1748 deletions(-)

diffs (truncated from 5886 to 300 lines):

diff -r 32a1ccfd28cc -r b39074682dca .settings/org.eclipse.jdt.core.prefs
--- a/.settings/org.eclipse.jdt.core.prefs      Tue Apr 19 10:13:37 2016 +0200
+++ b/.settings/org.eclipse.jdt.core.prefs      Mon May 02 11:06:25 2016 +0200
@@ -1,4 +1,3 @@
-#Wed Jun 22 21:40:12 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
diff -r 32a1ccfd28cc -r b39074682dca 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
    Tue Apr 19 10:13:37 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
    Mon May 02 11:06:25 2016 +0200
@@ -376,6 +376,20 @@
 <!--5D3526B2FC0F4BB2BE7FE13C5E9C009A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--5D3526B2FC0F4BB2BE7FE13C5E9C009A--></AD_ELEMENT>
 
+<!--5EE957873DEE4461A57BA8CAEAF50943--><AD_ELEMENT>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  
<AD_ELEMENT_ID><![CDATA[5EE957873DEE4461A57BA8CAEAF50943]]></AD_ELEMENT_ID>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  
<COLUMNNAME><![CDATA[ad_org_id_process]]></COLUMNNAME>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <NAME><![CDATA[Process 
Organization]]></NAME>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <PRINTNAME><![CDATA[Process 
Organization]]></PRINTNAME>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <DESCRIPTION><![CDATA[Parameter used 
to save value of current Process Definition ad_org_id 
parameter.]]></DESCRIPTION>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <HELP><![CDATA[Parameter used to save 
value of current Process Definition ad_org_id parameter.]]></HELP>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--5EE957873DEE4461A57BA8CAEAF50943--></AD_ELEMENT>
+
 <!--5FD519D1480447A092C2C08E6B462B8E--><AD_ELEMENT>
 <!--5FD519D1480447A092C2C08E6B462B8E-->  
<AD_ELEMENT_ID><![CDATA[5FD519D1480447A092C2C08E6B462B8E]]></AD_ELEMENT_ID>
 <!--5FD519D1480447A092C2C08E6B462B8E-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 32a1ccfd28cc -r b39074682dca 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
     Tue Apr 19 10:13:37 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
     Mon May 02 11:06:25 2016 +0200
@@ -561,6 +561,7 @@
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  
<DISPLAYLOGIC><![CDATA[@$Element_MC@='Y' & @trxtype@!'']]></DISPLAYLOGIC>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  
<AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--4DB168F8AC3B4A4CB543489EDFF76AED-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -801,6 +802,7 @@
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  
<DISPLAYLOGIC><![CDATA[@$Element_AY@='Y' & @trxtype@!'']]></DISPLAYLOGIC>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  
<AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -1655,6 +1657,7 @@
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  
<DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--BAD646D5B19945A9B5DB573C35ABF2C5-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -1733,6 +1736,7 @@
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  
<DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--C11C22D9EDD3481981FEDC94B977E6F4-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -1791,6 +1795,8 @@
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  
<DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--C511B1965C2A46C2BD8144DB918CD17B-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
+<!--C511B1965C2A46C2BD8144DB918CD17B-->  
<ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.organizationOnChangeFunction]]></ONCHANGEFUNCTION>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -1870,6 +1876,7 @@
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  
<DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--D58EE6F45C72436DB613C79F5FE8A37C-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -1898,6 +1905,7 @@
 <!--DA22BED18BD944C9B6252B8400B89934-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--DA22BED18BD944C9B6252B8400B89934-->  
<DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--DA22BED18BD944C9B6252B8400B89934-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--DA22BED18BD944C9B6252B8400B89934-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--DA22BED18BD944C9B6252B8400B89934-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--DA22BED18BD944C9B6252B8400B89934-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--DA22BED18BD944C9B6252B8400B89934-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -1978,6 +1986,7 @@
 <!--E3019D02BA14437A9BE0948000062776-->  
<OBUIAPP_PROCESS_ID><![CDATA[E68790A7B65F4D45AB35E2BAE34C1F39]]></OBUIAPP_PROCESS_ID>
 <!--E3019D02BA14437A9BE0948000062776-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--E3019D02BA14437A9BE0948000062776-->  
<DISPLAYLOGIC><![CDATA[(@fin_payment_id@==null | @fin_payment_id@==undefined | 
@fin_payment_id@=='') & @trxtype@!'' & @trxtype@!'BF']]></DISPLAYLOGIC>
+<!--E3019D02BA14437A9BE0948000062776-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--E3019D02BA14437A9BE0948000062776-->  
<ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.glitemOnChangeFunction]]></ONCHANGEFUNCTION>
 <!--E3019D02BA14437A9BE0948000062776-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--E3019D02BA14437A9BE0948000062776-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
@@ -2094,6 +2103,7 @@
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  
<DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--EE38C8A62FDC4554A241D5C590AD30B0-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -2176,6 +2186,7 @@
 <!--F627024CD1994930A448FD641C7BB43F-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--F627024CD1994930A448FD641C7BB43F-->  
<DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--F627024CD1994930A448FD641C7BB43F-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--F627024CD1994930A448FD641C7BB43F-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--F627024CD1994930A448FD641C7BB43F-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--F627024CD1994930A448FD641C7BB43F-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--F627024CD1994930A448FD641C7BB43F-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -2204,6 +2215,7 @@
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  
<DISPLAYLOGIC><![CDATA[@$Element_SR@='Y' & @trxtype@!'']]></DISPLAYLOGIC>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--F83C096DBCD64007B2A5E517D2C81BFC-->  
<READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & 
@fin_payment_id@!'']]></READONLYLOGIC>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
@@ -2238,6 +2250,34 @@
 <!--FB975E5F2AE3405197173B0DFB172ECC-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--FB975E5F2AE3405197173B0DFB172ECC--></OBUIAPP_PARAMETER>
 
+<!--FC511079CF1244BD80683D66D25A153D--><OBUIAPP_PARAMETER>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<OBUIAPP_PARAMETER_ID><![CDATA[FC511079CF1244BD80683D66D25A153D]]></OBUIAPP_PARAMETER_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <NAME><![CDATA[Process 
Organization]]></NAME>
+<!--FC511079CF1244BD80683D66D25A153D-->  <DESCRIPTION><![CDATA[Parameter used 
to save value of current Process Definition ad_org_id 
parameter.]]></DESCRIPTION>
+<!--FC511079CF1244BD80683D66D25A153D-->  <HELP><![CDATA[Parameter used to save 
value of current Process Definition ad_org_id parameter.]]></HELP>
+<!--FC511079CF1244BD80683D66D25A153D-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<AD_REFERENCE_VALUE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_VALUE_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<COLUMNNAME><![CDATA[ad_org_id_process]]></COLUMNNAME>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<AD_ELEMENT_ID><![CDATA[5EE957873DEE4461A57BA8CAEAF50943]]></AD_ELEMENT_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<OBUIAPP_PROCESS_ID><![CDATA[E68790A7B65F4D45AB35E2BAE34C1F39]]></OBUIAPP_PROCESS_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--FC511079CF1244BD80683D66D25A153D-->  
<ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--FC511079CF1244BD80683D66D25A153D--></OBUIAPP_PARAMETER>
+
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5--><OBUIAPP_PARAMETER>
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  
<OBUIAPP_PARAMETER_ID><![CDATA[FDF5AB17A1154D6AB440E1F5A02B45F5]]></OBUIAPP_PARAMETER_ID>
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 32a1ccfd28cc -r b39074682dca 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
      Tue Apr 19 10:13:37 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
      Mon May 02 11:06:25 2016 +0200
@@ -219,7 +219,7 @@
 <!--EE54530EA4884AD5A10365E480015325-->  <NAME><![CDATA[Payment Selector 
Transaction for Parameter Window]]></NAME>
 <!--EE54530EA4884AD5A10365E480015325-->  
<AD_REFERENCE_ID><![CDATA[3F7FDB0EAC9A42B69E8238335FFA59EC]]></AD_REFERENCE_ID>
 <!--EE54530EA4884AD5A10365E480015325-->  
<AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
-<!--EE54530EA4884AD5A10365E480015325-->  <WHERECLAUSE><![CDATA[e.status in 
('RPR', 'PPM') and e.amount <>0 and exists ( select 1 from 
FinancialMgmtFinAccPaymentMethod as  fapm join fapm.account as fa where 
fapm.paymentMethod = e.paymentMethod and fa.id = @Fin_Financial_Account_ID@ and 
(case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = 
true and fa.currency = e.account.currency) and not exists (select 1 from 
FIN_Finacc_Transaction as ft where e = ft.finPayment) and 
AD_ISORGINCLUDED(e.organization.id,@inpadOrgId@,e.client.id)<>-1]]></WHERECLAUSE>
+<!--EE54530EA4884AD5A10365E480015325-->  <WHERECLAUSE><![CDATA[e.status in 
('RPR', 'PPM') and e.amount <>0 and exists ( select 1 from 
FinancialMgmtFinAccPaymentMethod as  fapm join fapm.account as fa where 
fapm.paymentMethod = e.paymentMethod and fa.id = @Fin_Financial_Account_ID@ and 
(case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = 
true and fa.currency = e.account.currency) and not exists (select 1 from 
FIN_Finacc_Transaction as ft where e = ft.finPayment) and 
AD_ISORGINCLUDED(e.organization.id,@ad_org_id_process@,e.client.id)<>-1]]></WHERECLAUSE>
 <!--EE54530EA4884AD5A10365E480015325-->  
<OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--EE54530EA4884AD5A10365E480015325-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EE54530EA4884AD5A10365E480015325-->  
<SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE>
diff -r 32a1ccfd28cc -r b39074682dca 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
  Tue Apr 19 10:13:37 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
  Mon May 02 11:06:25 2016 +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-2015 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -102,10 +102,10 @@
         openedFromMenu = "null".equals(parameters.get("windowId").toString()) 
? true : false;
       }
       String strOrgId = null;
-      if (jsonRequest.has("inpadOrgId") && jsonRequest.get("inpadOrgId") != 
JSONObject.NULL) {
+      if (jsonparams.has("ad_org_id") && jsonparams.get("ad_org_id") != 
JSONObject.NULL) {
+        strOrgId = jsonparams.getString("ad_org_id");
+      } else if (jsonRequest.has("inpadOrgId") && 
jsonRequest.get("inpadOrgId") != JSONObject.NULL) {
         strOrgId = jsonRequest.getString("inpadOrgId");
-      } else if (jsonparams.has("ad_org_id") && jsonparams.get("ad_org_id") != 
JSONObject.NULL) {
-        strOrgId = jsonparams.getString("ad_org_id");
       }
       Organization org = OBDal.getInstance().get(Organization.class, strOrgId);
       boolean isReceipt = jsonparams.getBoolean("issotrx");
@@ -566,11 +566,6 @@
     if (!"Error".equalsIgnoreCase(message.getType())) {
       message.setMessage(strNewPaymentMessage + " " + message.getMessage());
       message.setType(message.getType().toLowerCase());
-    } else {
-      conn = new DalConnectionProvider(true);
-      OBDal.getInstance().getSession().clear();
-      payment = OBDal.getInstance().get(FIN_Payment.class, payment.getId());
-      addCredit(payment, jsonparams, refundAmount, strDifferenceAction);
     }
     if (!strDifferenceAction.equals("refund")) {
       return message;
diff -r 32a1ccfd28cc -r b39074682dca 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
      Tue Apr 19 10:13:37 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
      Mon May 02 11:06:25 2016 +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-2015 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -173,7 +173,6 @@
         isReceipt = payment.isReceipt();
         description = StringUtils.isNotBlank(payment.getDescription()) ? 
payment.getDescription()
             .replace("\n", ". ") : "";
-        organization = payment.getOrganization();
         paymentCurrency = payment.getCurrency();
         convertRate = payment.getFinancialTransactionConvertRate();
         sourceAmount = payment.getAmount();
@@ -183,8 +182,9 @@
         depositAmt = new BigDecimal(strDepositAmount);
         paymentAmt = new BigDecimal(strWithdrawalamt);
         isReceipt = (depositAmt.compareTo(paymentAmt) >= 0);
-        description = (StringUtils.isBlank(strDescription) || 
strDescription.equals("null")) ? OBMessageUtils.messageBD("APRM_GLItem")
-            + ": " + glItem.getName() : strDescription;
+        description = (StringUtils.isBlank(strDescription) || 
strDescription.equals("null")) ? OBMessageUtils
+            .messageBD("APRM_GLItem") + ": " + glItem.getName()
+            : strDescription;
       } else { // Bank Fee or transaction without payment and gl item
         depositAmt = new BigDecimal(strDepositAmount);
         paymentAmt = new BigDecimal(strWithdrawalamt);
diff -r 32a1ccfd28cc -r b39074682dca 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpression.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpression.java
     Tue Apr 19 10:13:37 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpression.java
     Mon May 02 11:06:25 2016 +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-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -59,6 +59,7 @@
         }
       }
     } catch (Exception e) {
+      log.error("Error calculating filter expression", e);
       return "";
     }
     return "";
diff -r 32a1ccfd28cc -r b39074682dca 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java
    Tue Apr 19 10:13:37 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java
    Mon May 02 11:06:25 2016 +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-2015 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -155,6 +155,10 @@
   public String getOrganization(Map<String, String> requestMap) throws 
JSONException {
     // Organization of the current Payment
     JSONObject context = new JSONObject(requestMap.get("context"));
+    if (context.has("ad_org_id") && context.get("ad_org_id") != JSONObject.NULL
+        && StringUtils.isNotEmpty(context.getString("ad_org_id"))) {
+      return context.getString("ad_org_id");
+    }
     if (context.has("inpadOrgId") && context.get("inpadOrgId") != 
JSONObject.NULL
         && StringUtils.isNotEmpty(context.getString("inpadOrgId"))) {
       return context.getString("inpadOrgId");
diff -r 32a1ccfd28cc -r b39074682dca 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js
--- 
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js
        Tue Apr 19 10:13:37 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js
        Mon May 02 11:06:25 2016 +0200
@@ -27,6 +27,7 @@
     value: bankStatementLineId
   }));
   view.theForm.hideItem('bankStatementLineId');
+  
view.theForm.getItem('ad_org_id_process').setValue(view.theForm.getItem('ad_org_id').getValue());
 };
 
 
@@ -123,4 +124,8 @@
 
 OB.APRM.AddTransaction.trxDateOnChangeFunction = function (item, view, form, 
grid) {
   form.getItem('dateacct').setDateParameterValue(new Date(item.getValue()));
+};

------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to