details:   https://code.openbravo.com/erp/devel/pi/rev/afb2d019fd78
changeset: 34145:afb2d019fd78
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Tue Apr 24 08:16:45 2018 +0200
summary:   [license] remove obsolete public key

details:   https://code.openbravo.com/erp/devel/pi/rev/77cc4f65b1d0
changeset: 34146:77cc4f65b1d0
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Tue Apr 24 09:51:12 2018 +0200
summary:   [license] removed support for On Demand licenses

details:   https://code.openbravo.com/erp/devel/pi/rev/893677531a1b
changeset: 34147:893677531a1b
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Tue Apr 24 09:59:22 2018 +0200
summary:   [license] don't use HSAS as ConnectionProvider in InstanceManagement 
form

details:   https://code.openbravo.com/erp/devel/pi/rev/6e50c5e7df62
changeset: 34148:6e50c5e7df62
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Tue Apr 24 10:31:53 2018 +0200
summary:   [license] Instance Activation form: removed 2.50 UI components

details:   https://code.openbravo.com/erp/devel/pi/rev/ac189b130d73
changeset: 34149:ac189b130d73
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Tue Apr 24 11:15:02 2018 +0200
summary:   [license] moved HTML license visualization to Instance Activation 
Servlet

details:   https://code.openbravo.com/erp/devel/pi/rev/d9ce9a9f3c40
changeset: 34150:d9ce9a9f3c40
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Tue Apr 24 11:15:48 2018 +0200
summary:   [license] limit named users only if set in properties

details:   https://code.openbravo.com/erp/devel/pi/rev/ddccda9c7091
changeset: 34151:ddccda9c7091
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon May 14 11:19:22 2018 +0200
summary:   [license] Removed concurrent named user restrictions

  Now it is no longer possible to define in Openbravo.properties concurrent 
named
  user restriction.

details:   https://code.openbravo.com/erp/devel/pi/rev/3c86e8920502
changeset: 34152:3c86e8920502
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon May 14 12:38:19 2018 +0200
summary:   [license] removed already deprecated ad_module.commercial_tier column

  This information was set to support Basic instances which now are no longer
  supported in Central Repository, so they can be removed.

details:   https://code.openbravo.com/erp/devel/pi/rev/9e34b49d6804
changeset: 34153:9e34b49d6804
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Wed May 30 16:08:26 2018 +0200
summary:   [license] pi merge

details:   https://code.openbravo.com/erp/devel/pi/rev/498bb9729855
changeset: 34154:498bb9729855
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Wed May 30 16:50:03 2018 +0200
summary:   [license] use set for better perfomance

details:   https://code.openbravo.com/erp/devel/pi/rev/d6db8cc14085
changeset: 34155:d6db8cc14085
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Wed May 30 17:01:27 2018 +0200
summary:   [license] removed openInstanceManagementForm as out of demand 
platform was its only user

details:   https://code.openbravo.com/erp/devel/pi/rev/753060462f38
changeset: 34156:753060462f38
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu May 31 09:29:46 2018 +0200
summary:   [license] pi merge

details:   https://code.openbravo.com/erp/devel/pi/rev/98d4794d0fc1
changeset: 34157:98d4794d0fc1
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Thu May 31 12:32:09 2018 +0200
summary:   [license] trying to refresh with a broken license

  This can happen in case of old Basic licenses that were singed with a now
  invalid key. Refreshing the license from Butler will fix the problem.

details:   https://code.openbravo.com/erp/devel/pi/rev/b63c083262e3
changeset: 34158:b63c083262e3
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jun 01 10:40:19 2018 +0200
summary:   [license] removed some clutter

details:   https://code.openbravo.com/erp/devel/pi/rev/7a4554ef6d4a
changeset: 34159:7a4554ef6d4a
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jun 01 11:56:17 2018 +0200
summary:   fixes 38679: remove obsolete License features

  Removed:
   - On demand license
   - Named users restrictions
   - Commercial module tiers

details:   https://code.openbravo.com/erp/devel/pi/rev/4bd839ca0394
changeset: 34160:4bd839ca0394
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jun 01 12:49:04 2018 +0200
summary:   [license] pi merge

diffstat:

 .hgsigs                                                                        
                                                    |     3 +
 .hgtags                                                                        
                                                    |     3 +
 build.xml                                                                      
                                                    |    44 +-
 config/Openbravo.properties.template                                           
                                                    |     9 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
                              |     3 -
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
                              |     3 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
                                   |     3 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml
                                   |     3 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml
                               |     3 +-
 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/ModifyPaymentPlanHook.java
                                   |    44 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java
                |     4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java
            |    49 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanHookCaller.java
               |    45 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
                                     |    11 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
                                  |     6 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMApplicationInitializer.java
                      |    88 -
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMSQLFunctionRegister.java
                         |    99 +
 
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.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java
                                            |    28 +-
 modules/org.openbravo.base.weld/src/META-INF/beans.xml                         
                                                    |     4 +-
 
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_DATA_POOL_SEL.xml
                                    |    55 +
 
modules/org.openbravo.client.application/src-db/database/model/views/OBUIAPP_POOL_REPORT_V.xml
                                     |     4 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
                                                  |   773 +++
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
                                                 |    42 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
                                                   |   168 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml 
                                                   |    14 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
                                                 |    12 +
 
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/src-db/database/sourcedata/AD_PREFERENCE.xml
                                              |    13 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REFERENCE.xml
                                               |    28 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml
                                                |    12 +
 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml 
                                                    |    31 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml
                                                   |    49 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
                                                |    23 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml
                                                  |    17 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
                                           |    19 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
                                     |    47 +
 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java
                |     2 +
 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java
           |     7 +
 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java
               |     7 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
                              |    10 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
                    |     7 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/HeartBeatPopUpComponent.java
                         |     4 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java
          |    22 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java
           |   228 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/DataPoolSelectionEventHandler.java
             |    96 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java
                  |    21 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/CompiledReportManager.java
                    |     7 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportCompiler.java
                           |     9 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java
                           |   116 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java
    |    20 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/hooks/DataPoolSelectionWindowInjector.java
    |    79 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/callback/ob-extra-window-settings-actions.js
      |    33 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js
               |    16 -
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js
      |    22 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
            |     7 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
        |    48 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
                                   |     4 +-
 
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.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java
                              |    45 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelSQLFunctionRegister.java
                                 |    52 +
 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.myob/src/org/openbravo/client/myob/WidgetProvider.java
                                                |    12 +-
 
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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java
 |    61 +-
 
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/DataSourceProperty.java
                              |    10 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
                               |    21 +-
 
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/DataToJsonConverter.java
                                         |    15 +-
 
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.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
      |    29 +-
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
                       |    37 +-
 
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 +-
 modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml     
                                                    |     2 +-
 
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                              |     6 +-
 modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml    
                                                    |     2 +-
 
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                             |    24 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml              
                                                    |     2 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml   
                                                    |    22 +-
 referencedata/sampledata/F_B_International_Group/AD_ORG.xml                    
                                                    |    24 +
 referencedata/sampledata/QA_Testing/AD_ORG.xml                                 
                                                    |     8 +
 referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml                            
                                                    |    20 +
 referencedata/sampledata/QA_Testing/AD_USER.xml                                
                                                    |     4 +-
 referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml                       
                                                    |   168 +
 referencedata/sampledata/QA_Testing/C_BPARTNER.xml                             
                                                    |    74 +-
 referencedata/sampledata/QA_Testing/FIN_FINANCIAL_ACCOUNT.xml                  
                                                    |     7 +
 referencedata/sampledata/QA_Testing/M_INOUT.xml                                
                                                    |    32 +
 referencedata/sampledata/QA_Testing/M_PRODUCT.xml                              
                                                    |    52 +
 referencedata/sampledata/QA_Testing/M_PRODUCTPRICE.xml                         
                                                    |    36 +
 referencedata/sampledata/QA_Testing/M_PRODUCT_ACCT.xml                         
                                                    |    34 +
 referencedata/sampledata/QA_Testing/OBUIAPP_PROCESS_ACCESS.xml                 
                                                    |    84 +
 src-core/.settings/org.eclipse.jdt.core.prefs                                  
                                                    |    11 -
 src-core/build.xml                                                             
                                                    |     4 +-
 src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java         
                                                    |     9 +-
 src-db/database/build-create.xml                                               
                                                    |     8 +-
 src-db/database/build.xml                                                      
                                                    |     4 +-
 src-db/database/lib/dbsourcemanager.jar                                        
                                                    |   Bin 
 src-db/database/model/excludeFilter.xml                                        
                                                    |     5 +
 src-db/database/model/functions/AD_GET_ORG_LE_BU.xml                           
                                                    |   100 +-
 src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml                  
                                                    |   101 +
 src-db/database/model/functions/AD_ISTRIGGERENABLED.xml                        
                                                    |    40 -
 src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml                    
                                                    |    60 +-
 src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml                  
                                                    |    77 +
 src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml               
                                                    |    42 +-
 src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml             
                                                    |    65 +
 src-db/database/model/functions/AD_ORG_READY.xml                               
                                                    |    94 +-
 src-db/database/model/functions/A_ASSET_CREATE.xml                             
                                                    |    35 +-
 src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml                  
                                                    |     1 +
 src-db/database/model/functions/C_CASH_POST.xml                                
                                                    |    78 +-
 src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml                     
                                                    |    10 +-
 src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml                
                                                    |     7 +-
 src-db/database/model/functions/C_CURRENCY_CONVERT.xml                         
                                                    |     3 +-
 src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml               
                                                    |     3 +-
 src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml                    
                                                    |     3 +-
 src-db/database/model/functions/C_CURRENCY_RATE.xml                            
                                                    |     3 +-
 src-db/database/model/functions/C_GETWITHHOLDING.xml                           
                                                    |    15 +-
 src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml                   
                                                    |     3 +-
 src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml                       
                                                    |    11 +-
 src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml                
                                                    |     3 +-
 src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml                 
                                                    |     3 +-
 src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml                     
                                                    |     3 +-
 src-db/database/model/functions/C_INVOICETAX_ADJUSTMENT.xml                    
                                                    |    18 +-
 src-db/database/model/functions/C_INVOICE_CREATE0.xml                          
                                                    |     3 +-
 src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml                    
                                                    |     3 +-
 src-db/database/model/functions/C_INVOICE_POST.xml                             
                                                    |    41 +-
 src-db/database/model/functions/C_ORDERTAX_ADJUSTMENT.xml                      
                                                    |    18 +-
 src-db/database/model/functions/C_ORDER_POST1.xml                              
                                                    |    36 +-
 src-db/database/model/functions/C_PROJECT_WON.xml                              
                                                    |     8 +-
 src-db/database/model/functions/C_TAXPAYMENT_POST.xml                          
                                                    |     8 +-
 src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml                  
                                                    |     3 +-
 src-db/database/model/functions/MRP_PURCHASEPLAN.xml                           
                                                    |     5 +-
 src-db/database/model/functions/MRP_RUN_EXPLODE.xml                            
                                                    |     5 +-
 src-db/database/model/functions/MRP_RUN_INITIALIZE.xml                         
                                                    |     8 +-
 src-db/database/model/functions/M_GET_STOCK_PARAM.xml                          
                                                    |     3 +-
 src-db/database/model/functions/M_INOUT_CREATE.xml                             
                                                    |     6 +-
 src-db/database/model/functions/M_INOUT_CREATE0.xml                            
                                                    |     3 +-
 src-db/database/model/functions/M_INOUT_POST.xml                               
                                                    |     1 -
 src-db/database/model/functions/M_MOVEMENT_POST.xml                            
                                                    |     1 +
 src-db/database/model/functions/M_RESERVATION_POST.xml                         
                                                    |     4 +-
 src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml                   
                                                    |     3 +-
 src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml                       
                                                    |     3 +-
 src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml             
                                                    |     3 +-
 src-db/database/model/prescript-Oracle.sql                                     
                                                    |   105 +
 src-db/database/model/prescript-PostgreSql.sql                                 
                                                    |    82 +
 src-db/database/model/tables/AD_HEARTBEAT_LOG.xml                              
                                                    |     4 -
 src-db/database/model/tables/AD_MODULE.xml                                     
                                                    |     8 -
 src-db/database/model/tables/AD_MODULE_INSTALL.xml                             
                                                    |     8 -
 src-db/database/model/tables/AD_ORG.xml                                        
                                                    |    35 +
 src-db/database/model/tables/AD_ROLE.xml                                       
                                                    |     4 +-
 src-db/database/model/tables/AD_SESSION_STATUS.xml                             
                                                    |    49 -
 src-db/database/model/tables/AD_SYSTEM_INFO.xml                                
                                                    |     4 -
 src-db/database/model/tables/M_INOUT.xml                                       
                                                    |     2 +-
 src-db/database/model/tables/M_PRODUCT.xml                                     
                                                    |     8 +
 src-db/database/model/tables/M_PRODUCT_STATUS.xml                              
                                                    |    98 +
 src-db/database/model/tables/M_PRODUCT_STATUS_TRL.xml                          
                                                    |    74 +
 src-db/database/model/tables/M_WAREHOUSE.xml                                   
                                                    |     6 +-
 src-db/database/model/triggers/AD_MODULE_TRG.xml                               
                                                    |    81 +-
 src-db/database/model/triggers/AD_MODULE_TRG2.xml                              
                                                    |     4 +-
 src-db/database/model/triggers/AD_MODULE_VERSION_TRG.xml                       
                                                    |    14 +-
 src-db/database/model/triggers/AD_ROLE_TRG.xml                                 
                                                    |     5 +-
 src-db/database/model/triggers/C_ORDERLINE_TRG2.xml                            
                                                    |    15 +-
 src-db/database/model/triggers/C_PERIOD_TRG.xml                                
                                                    |     9 +-
 src-db/database/model/triggers/M_RESERVATION_TRG.xml                           
                                                    |     3 +-
 src-db/database/sourcedata/AD_CALLOUT.xml                                      
                                                    |    20 -
 src-db/database/sourcedata/AD_COLUMN.xml                                       
                                                    |  2101 +++++++--
 src-db/database/sourcedata/AD_DATASET_COLUMN.xml                               
                                                    |    11 -
 src-db/database/sourcedata/AD_DATASET_TABLE.xml                                
                                                    |    14 +
 src-db/database/sourcedata/AD_ELEMENT.xml                                      
                                                    |   276 +-
 src-db/database/sourcedata/AD_FIELD.xml                                        
                                                    |   975 ++++-
 src-db/database/sourcedata/AD_FIELDGROUP.xml                                   
                                                    |    10 +
 src-db/database/sourcedata/AD_MENU.xml                                         
                                                    |    14 +
 src-db/database/sourcedata/AD_MESSAGE.xml                                      
                                                    |   194 +-
 src-db/database/sourcedata/AD_MODULE.xml                                       
                                                    |     2 +-
 src-db/database/sourcedata/AD_REFERENCE.xml                                    
                                                    |    41 +-
 src-db/database/sourcedata/AD_REF_LIST.xml                                     
                                                    |    48 +-
 src-db/database/sourcedata/AD_TAB.xml                                          
                                                    |    59 +
 src-db/database/sourcedata/AD_TABLE.xml                                        
                                                    |    75 +-
 src-db/database/sourcedata/AD_TREENODE.xml                                     
                                                    |   113 +-
 src-db/database/sourcedata/AD_VAL_RULE.xml                                     
                                                    |     4 +-
 src-db/database/sourcedata/AD_WINDOW.xml                                       
                                                    |    16 +
 src-db/database/sourcedata/M_PRODUCT_STATUS.xml                                
                                                    |    93 +
 src-db/database/sourcedata/OBUISEL_SELECTOR.xml                                
                                                    |    35 +
 src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml                          
                                                    |   176 +
 src-test/src/org/openbravo/test/AllAntTaskTests.java                           
                                                    |    10 +-
 src-test/src/org/openbravo/test/AllWebserviceTests.java                        
                                                    |     4 +-
 src-test/src/org/openbravo/test/base/OBBaseTest.java                           
                                                    |    43 +-
 src-test/src/org/openbravo/test/costing/TestCostingLandedCost.java             
                                                    |   308 +-
 src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java    
                                                    |   147 +-
 src-test/src/org/openbravo/test/costing/utils/TestCostingUtils.java            
                                                    |   336 +-
 src-test/src/org/openbravo/test/dal/DalComplexQueryTestOrderLine.java          
                                                    |     8 +-
 src-test/src/org/openbravo/test/dal/IssuesTest.java                            
                                                    |    32 +-
 src-test/src/org/openbravo/test/datasource/DatasourceTestUtil.java             
                                                    |     2 +-
 
src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoConstants.java
                                |    57 +
 
src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoCornerCaseOrgTest.java
                        |    59 +
 
src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoSetReadyTest.java
                             |   109 +
 
src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoTestSuite.java
                                |    28 +
 
src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoUtility.java
                                  |   294 +
 
src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistOrgInfoComplexOrgTreeTest.java
                    |   142 +
 src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java       
                                                    |     9 +-
 src-test/src/org/openbravo/test/productStatus/ProductStatusTest.java           
                                                    |   223 +
 
src-test/src/org/openbravo/test/selector/TestSelectorDefaultFilterActionHandler.java
                                               |    66 +
 src-util/buildvalidation/build.xml                                             
                                                    |     7 +-
 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.class
                          |   Bin 
 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValueData.class
                      |   Bin 
 
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/JdkVersionCheck.class
                                         |   Bin 
 
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.java
                                     |    62 +
 
src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue_data.xsql
                                |    49 +
 
src-util/buildvalidation/src/org/openbravo/buildvalidation/JdkVersionCheck.java 
                                                   |    57 -
 
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateIsCompletelyInvoicedData.class
                                |   Bin 
 
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfo.class
                                          |   Bin 
 
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfoData.class
                                      |   Bin 
 
src-util/modulescript/src/org/openbravo/modulescript/UpdateIsCompletelyInvoiced_data.xsql
                                          |     4 +-
 src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo.java 
                                                    |    61 +
 
src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo_data.xsql
                                                |   123 +
 src/build.xml                                                                  
                                                    |    50 +-
 src/index.jsp                                                                  
                                                    |     6 +-
 src/org/openbravo/authentication/AuthenticationManager.java                    
                                                    |    11 +
 src/org/openbravo/authentication/basic/AutologonAuthenticationManager.java     
                                                    |     7 +-
 src/org/openbravo/base/secureApp/LoginHandler.java                             
                                                    |    31 +-
 src/org/openbravo/base/secureApp/LoginUtils.java                               
                                                    |    13 +-
 src/org/openbravo/base/secureApp/OrgTree_data.xsql                             
                                                    |    32 -
 src/org/openbravo/base/secureApp/UserLock.java                                 
                                                    |    72 +-
 src/org/openbravo/base/session/SessionFactoryController.java                   
                                                    |    21 +-
 src/org/openbravo/base/structure/BaseOBObject.java                             
                                                    |    10 +-
 
src/org/openbravo/common/actionhandler/CashflowForecastReportActionHandler.java 
                                                   |    11 +-
 src/org/openbravo/costing/AverageAlgorithm.java                                
                                                    |     5 +-
 src/org/openbravo/costing/AverageCostAdjustment.java                           
                                                    |   255 +-
 src/org/openbravo/costing/CostAdjustmentProcess.java                           
                                                    |    50 +-
 src/org/openbravo/costing/CostAdjustmentUtils.java                             
                                                    |    65 +-
 src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java                   
                                                    |    28 +-
 src/org/openbravo/costing/CostingMigrationProcess.java                         
                                                    |     9 +-
 src/org/openbravo/costing/CostingUtils.java                                    
                                                    |     4 +-
 src/org/openbravo/dal/core/DalLayerInitializer.java                            
                                                    |    42 +-
 src/org/openbravo/dal/core/DalSessionFactoryController.java                    
                                                    |    39 +-
 src/org/openbravo/dal/core/SQLFunctionRegister.java                            
                                                    |    39 +
 src/org/openbravo/dal/core/TriggerHandler.java                                 
                                                    |    68 +-
 src/org/openbravo/dal/service/DataPoolChecker.java                             
                                                    |   144 +
 src/org/openbravo/dal/service/OBDal.java                                       
                                                    |    33 +-
 src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java            
                                                    |    41 +-
 src/org/openbravo/erpCommon/ad_callouts/SE_Calendar_For_Org.java               
                                                    |    99 -
 src/org/openbravo/erpCommon/ad_callouts/SE_Years_For_Calendar.java             
                                                    |   100 -
 src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator.java              
                                                    |    94 -
 src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator_data.xsql         
                                                    |    65 -
 src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java              
                                                    |    36 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Tax.java                    
                                                    |    96 -
 src/org/openbravo/erpCommon/ad_callouts/SL_JournalLineAmt.java                 
                                                    |     6 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_MovementAll_Locator.java            
                                                    |    97 -
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts.java                
                                                    |   214 -
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts_data.xsql           
                                                    |    53 -
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType.java                
                                                    |    93 -
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType_data.xsql           
                                                    |    49 -
 src/org/openbravo/erpCommon/ad_callouts/SL_Payment_No_Verify.java              
                                                    |   105 -
 src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.java       
                                                    |    88 -
 src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.xsql       
                                                    |    37 -
 src/org/openbravo/erpCommon/ad_forms/DocInvoice.java                           
                                                    |     4 +-
 src/org/openbravo/erpCommon/ad_forms/Heartbeat.java                            
                                                    |     5 +-
 src/org/openbravo/erpCommon/ad_forms/Heartbeat_data.xsql                       
                                                    |     8 +-
 src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html                   
                                                    |     4 +-
 src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java                   
                                                    |   267 +-
 src/org/openbravo/erpCommon/ad_forms/InstanceManagement.xml                    
                                                    |     4 +-
 src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.xml      
                                                    |     4 +-
 src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java                      
                                                    |    18 +-
 src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java                   
                                                    |    14 +-
 src/org/openbravo/erpCommon/ad_process/SystemInfo_data.xsql                    
                                                    |     9 +-
 
src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java
                                            |     8 +-
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail_data.xsql      
                                                    |     6 +-
 src/org/openbravo/erpCommon/businessUtility/Heartbeat_data.xsql                
                                                    |    33 -
 src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java           
                                                    |     4 +-
 src/org/openbravo/erpCommon/info/AttributeSetInstance.java                     
                                                    |    38 +-
 src/org/openbravo/erpCommon/obps/ActivationKey.java                            
                                                    |   371 +-
 src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java                    
                                                    |    29 +-
 src/org/openbravo/erpCommon/utility/ComboTableData.java                        
                                                    |     5 +-
 src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java               
                                                    |    42 +-
 src/org/openbravo/erpCommon/utility/PrintJR.java                               
                                                    |    10 +-
 src/org/openbravo/erpCommon/utility/StringCollectionUtils.java                 
                                                    |    15 +
 src/org/openbravo/erpCommon/utility/SystemInfo.java                            
                                                    |    22 +-
 src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql                       
                                                    |    12 +-
 src/org/openbravo/erpCommon/utility/poc/EmailManager.java                      
                                                    |     7 +-
 src/org/openbravo/erpCommon/utility/reporting/ReportManager.java               
                                                    |     2 +-
 src/org/openbravo/erpReports/RptM_Requisition.java                             
                                                    |    24 +-
 src/org/openbravo/erpReports/RptM_Requisition.jrxml                            
                                                    |     3 +-
 src/org/openbravo/materialmgmt/InventoryCountProcess.java                      
                                                    |     6 +-
 src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java                   
                                                    |    14 +-
 src/org/openbravo/service/system/DatabaseValidator.java                        
                                                    |     3 +-
 314 files changed, 10091 insertions(+), 4858 deletions(-)

diffs (truncated from 24299 to 300 lines):

diff -r 33a7fe93995e -r 4bd839ca0394 .hgsigs
--- a/.hgsigs   Thu Apr 19 12:31:46 2018 +0200
+++ b/.hgsigs   Fri Jun 01 12:49:04 2018 +0200
@@ -228,3 +228,6 @@
 f06ec509f2bf413f13d422e937ec12531fe1821a 0 
iEYEABECAAYFAlqzgcwACgkQCX/oGf+2qkP/EACeJH+QthNIdldCdTvfnllHXTXDo24AnRVV1DveMhhNbgb50zu8ETDZ1WVT
 b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 
iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC
 c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 
iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb
+9bad88c00b5da708f3e9c1abacd25ea6e6cfd664 0 
iEUEABECAAYFAlrXODoACgkQCX/oGf+2qkOblACg0WOwH27TgkH75iKw2Y9tNYxSL8oAl3j0FbjQF6F05ESzZC0l3Uv2Nfg=
+dc2ef98dc38f7c32c888dcf1f1adb37c6afb4d14 0 
iEYEABECAAYFAlrxbisACgkQCX/oGf+2qkMMCwCdFeF47f2MY7Pq3cdsyHon64EYekwAoPYllLnhYETGsUEqtiKSxvj9Mgxb
+2121d856284cf0c4f26faef336bd2aa41ada151f 0 
iEYEABECAAYFAlr8AykACgkQCX/oGf+2qkPKhQCfeQ+9S16IA3wZMgnoJjRRZRvG8SUAoIgKQPopjsjObnB6Qu1DyNgCByRt
diff -r 33a7fe93995e -r 4bd839ca0394 .hgtags
--- a/.hgtags   Thu Apr 19 12:31:46 2018 +0200
+++ b/.hgtags   Fri Jun 01 12:49:04 2018 +0200
@@ -239,3 +239,6 @@
 7b0d4c95c2b308cd1b12dcfbe2a36c7f77fb49a4 3.0PR17Q4.2
 46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1
 03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1
+650aaadd6b6c5fda4f7ad957701face4fa4c3317 3.0PR18Q1.2
+307b23f7635f3e92dd8fc8e7d55d09b7c914384c 3.0PR18Q2
+63c5e173ffdca0828d75476e5a48e2fae42ad9e9 3.0PR18Q1.3
diff -r 33a7fe93995e -r 4bd839ca0394 build.xml
--- a/build.xml Thu Apr 19 12:31:46 2018 +0200
+++ b/build.xml Fri Jun 01 12:49:04 2018 +0200
@@ -96,12 +96,19 @@
   <property name="buildValidation" value="true"/>
   <property name="modules" value=""/> 
  
-  <available file=".hg" property="is.hg" />
-
   <condition property="xdoclint.missing" value="" else="-Xdoclint:-missing">
     <equals arg1="${ant.java.version}" arg2="1.7"/>
   </condition>
 
+  <condition property="html.version" value="-html5" else="">
+    <not>
+      <or>
+        <equals arg1="${ant.java.version}" arg2="1.7"/>
+        <equals arg1="${ant.java.version}" arg2="1.8"/>
+      </or>
+    </not>
+  </condition>
+
   <condition property="calculate.core.rev">
    <istrue value="${calculate.core.revision}"/>
   </condition>
@@ -347,22 +354,23 @@
   
   <taskdef resource="axis-tasks.properties" classpathref="project.class.path" 
/>
   
-  <target name="init" depends="code.rev">
+  <target name="init">
     <fail if="root.user" message="Don't run ant tasks with the root user" />
     <fail if="no.java.home" message="The environment variable JAVA_HOME is not 
set." />
-  </target>
-
-  <target name="code.rev" depends="set.code.rev">
-    <condition property="code.revision" value="${hg.id}" else="0">
-      <isset property="hg.id" />
-    </condition>
-  </target>
-
-  <target name="set.code.rev" if="is.hg">
-    <exec executable="hg" outputproperty="hg.id" failifexecutionfails="false">
-      <arg value="id"/>
-      <arg value="-i"/>
-    </exec>
+    <fail message="Unsupported Java version ${ant.java.version}. Minimum 
required is 7 (1.7).">
+      <condition>
+        <equals arg1="${ant.java.version}" arg2="1.6"/>
+      </condition>
+    </fail>
+    <antversion property="min.ant.version" atleast="1.9.2" />
+    <antversion property="actual.ant.version" />
+    <fail message="Unsupported ant version ${actual.ant.version}. Minimum 
required is 1.9.2.">
+      <condition>
+        <not>
+          <isset property="min.ant.version"/>
+        </not>
+      </condition>
+    </fail>
   </target>
 
   <target name="compile.complete" depends="init, core.lib, wad.lib, trl.lib">
@@ -526,7 +534,7 @@
   </target>
 
   <target name="generate.java.doc">
-    <javadoc Windowtitle="${title}" access="protected" Header="${header}" 
Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" 
additionalparam="${xdoclint.missing}">
+    <javadoc Windowtitle="${title}" access="protected" Header="${header}" 
Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes" 
additionalparam="${xdoclint.missing} ${html.version}">
       <sourcepath>
         <pathelement path="${base.src}" />
         <pathelement path="${base.src.test}/src" />
@@ -950,8 +958,6 @@
                    replace="\1${core.rev}\3"
                    byline="true"/>
     
-    <echo message="${hg.id}" file="${tmpdir}/config/instance.revision"/>
-       
     <delete includeEmptyDirs="true">
       <fileset dir="${tmpdir}/modules" includes="**/*" defaultexcludes="no"/>
     </delete>
diff -r 33a7fe93995e -r 4bd839ca0394 config/Openbravo.properties.template
--- a/config/Openbravo.properties.template      Thu Apr 19 12:31:46 2018 +0200
+++ b/config/Openbravo.properties.template      Fri Jun 01 12:49:04 2018 +0200
@@ -10,7 +10,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) 2007-2017 Openbravo SLU 
+# * All portions are Copyright (C) 2007-2018 Openbravo SLU 
 # * All Rights Reserved. 
 # * Contributor(s):  ______________________________________.
 # ************************************************************************
@@ -197,13 +197,10 @@
 
 # If these properties are set, after a failed login the response time 
 # will be delayed, and the user account can be blocked.
-login.trial.delay.increment=0
-login.trial.delay.max=0
+login.trial.delay.increment=0.2
+login.trial.delay.max=3
 login.trial.user.lock=0
 
-# Prevents concurrent sessions for same user.
-login.limit.user.session=false
-
 ##########
 # Others #
 ##########
diff -r 33a7fe93995e -r 4bd839ca0394 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
     Thu Apr 19 12:31:46 2018 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
     Fri Jun 01 12:49:04 2018 +0200
@@ -1072,8 +1072,6 @@
 
   ELSIF (p_docaction = 'RE') THEN
     DECLARE
-      v_count NUMBER;
-      v_documentno VARCHAR2(40);
       v_PaymentPlanExpectedTotal NUMBER:= 0;
     BEGIN
       SELECT count(*), max(p.documentno)
@@ -1171,7 +1169,6 @@
 
   ELSIF (p_docaction = 'RC') THEN
     DECLARE
-      v_count NUMBER;
       v_prepaymentamt NUMBER;
     BEGIN
       v_delete_paymentplan := TRUE;
diff -r 33a7fe93995e -r 4bd839ca0394 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
     Thu Apr 19 12:31:46 2018 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
     Fri Jun 01 12:49:04 2018 +0200
@@ -16,7 +16,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) 2013-2015 Openbravo SLU
+* All portions are Copyright (C) 2013-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -97,7 +97,6 @@
 
     DECLARE
       v_payment_schedule_order VARCHAR2(32);
-      v_count NUMBER;
       v_pendingamount NUMBER;
       cur_invoicepayments RECORD;
     BEGIN
diff -r 33a7fe93995e -r 4bd839ca0394 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
  Thu Apr 19 12:31:46 2018 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
  Fri Jun 01 12:49:04 2018 +0200
@@ -19,7 +19,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2011-2016 Openbravo SLU
+* All portions are Copyright (C) 2011-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -106,6 +106,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE('aprm_ispaymentconfirmed exception');
   RAISE;
+  RETURN NULL;
 END APRM_ISPAYMENTCONFIRMED
 ]]></body>
     </function>
diff -r 33a7fe93995e -r 4bd839ca0394 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml
  Thu Apr 19 12:31:46 2018 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml
  Fri Jun 01 12:49:04 2018 +0200
@@ -22,7 +22,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) 2015 Openbravo SLU
+* All portions are Copyright (C) 2015-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -43,6 +43,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE('aprm_seqnumberinvoicepaidstatus exception');
   RAISE;
+  RETURN NULL;
 END APRM_SEQNOINVPAIDSTATUS
 ]]></body>
     </function>
diff -r 33a7fe93995e -r 4bd839ca0394 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml
      Thu Apr 19 12:31:46 2018 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml
      Fri Jun 01 12:49:04 2018 +0200
@@ -16,7 +16,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-2017 Openbravo SLU
+* All portions are Copyright (C) 2014-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -49,6 +49,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE('aprm_seqnumberpaymentstatus exception');
   RAISE;
+  RETURN NULL;
 END APRM_SEQNUMBERPAYMENTSTATUS
 ]]></body>
     </function>
diff -r 33a7fe93995e -r 4bd839ca0394 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Thu Apr 19 12:31:46 2018 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Fri Jun 01 12:49:04 2018 +0200
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and 
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.33768]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.34107]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your 
finances with an ERP does not have to be difficult. Enjoy a radically improved 
user experience that combines the power of an enterprise grade financial 
application with the simplicity and ease of a web 2.0 personal accounting 
service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and 
Receivables Management simplifies and automates the business processes around 
the management of financial accounts, from the receipt and issue of payment, to 
the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in 
the forum discussions or register feature requests or issues in the 
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and 
Receivable project in the OB Forge.]]></HELP>
diff -r 33a7fe93995e -r 4bd839ca0394 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Thu Apr 19 12:31:46 2018 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Fri Jun 01 12:49:04 2018 +0200
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.33768]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.34107]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User 
Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.33768]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.34107]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 33a7fe93995e -r 4bd839ca0394 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java
  Fri Jun 01 12:49:04 2018 +0200
@@ -0,0 +1,44 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (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.advpaymentmngt;
+
+import java.util.List;
+
+import org.openbravo.base.exception.OBException;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
+
+/***
+ * Abstract class created to implement hooks inside Modify Payment Plan 
process. All hooks in that
+ * process must extend this class so they implement the methods
+ * 
+ * @author Andy Armaignac Collazo
+ *
+ */
+public abstract class ModifyPaymentPlanHook {
+

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to