details:   https://code.openbravo.com/erp/devel/main/rev/723fa49e91e8
changeset: 24006:723fa49e91e8
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Wed Jul 23 09:46:04 2014 +0200
summary:   fixed bug 27157: multi-requests in summary functions in saved 
view/grid config

details:   https://code.openbravo.com/erp/devel/main/rev/ea11ba772c16
changeset: 24007:ea11ba772c16
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Wed Jul 02 13:09:12 2014 +0200
summary:   fixed bug  26968: jUnit test cases are failing because execution 
order in JDK7
Problem is some of these test cases rely the order each test is executed (based 
on method name) which
is not valid anymore. Solved the problem by forcing the required execution 
order.

details:   https://code.openbravo.com/erp/devel/main/rev/54aed913a1d0
changeset: 24008:54aed913a1d0
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Mon Jul 21 08:40:58 2014 +0200
summary:   related to bug 27107: fixed test cases in TableNameTest

details:   https://code.openbravo.com/erp/devel/main/rev/d7da614f73e5
changeset: 24009:d7da614f73e5
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Mon Jul 21 09:35:59 2014 +0200
summary:   related to bug 27107: fixed test cases in DBPrefixTest

details:   https://code.openbravo.com/erp/devel/main/rev/63e85713f066
changeset: 24010:63e85713f066
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Mon Jul 21 12:35:34 2014 +0200
summary:   related to bug 27107: fixed test cases in DynamicEntityTest and 
other.

details:   https://code.openbravo.com/erp/devel/main/rev/481f3cde439d
changeset: 24011:481f3cde439d
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Mon Jul 21 14:15:37 2014 +0200
summary:   related to bug 27107: fixed test cases in ReadByNameTest and other.

details:   https://code.openbravo.com/erp/devel/main/rev/98cf93510f9d
changeset: 24012:98cf93510f9d
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Tue Jul 22 10:31:55 2014 +0200
summary:   related to bug 27107: fixed test cases in PreferenceTest.

details:   https://code.openbravo.com/erp/devel/main/rev/b05fad6868ec
changeset: 24013:b05fad6868ec
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Tue Jul 22 16:58:27 2014 +0200
summary:   related to bug 27107: fixed test cases in DalTest.

details:   https://code.openbravo.com/erp/devel/main/rev/cd19739e8298
changeset: 24014:cd19739e8298
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Aug 01 12:37:37 2014 +0200
summary:   fixed bug 27234: fixed auxiliary inputs set by callouts in mode NEW

 don't overwrite auxiliary inputs calculated by callouts when in NEW mode

details:   https://code.openbravo.com/erp/devel/main/rev/d9bd335d1e18
changeset: 24015:d9bd335d1e18
user:      Shankar Balachandran <shankar.balachandran <at> openbravo.com>
date:      Thu Jul 24 16:34:46 2014 +0530
summary:   Fixes issue 27175: Unexpected field in Search Product selector

escape html in identifier field only if it is present in the selector grid.

details:   https://code.openbravo.com/erp/devel/main/rev/abfe5a20ef57
changeset: 24016:abfe5a20ef57
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Fri Aug 01 13:26:17 2014 +0000
summary:   Update AD_MODULE version to 3.0PR14Q2.5

details:   https://code.openbravo.com/erp/devel/main/rev/11ed6ecc0a19
changeset: 24017:11ed6ecc0a19
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Fri Aug 01 13:26:17 2014 +0000
summary:   Added tag 3.0PR14Q2.5 for changeset abfe5a20ef57

details:   https://code.openbravo.com/erp/devel/main/rev/86db4cf5544b
changeset: 24018:86db4cf5544b
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Fri Aug 01 13:26:18 2014 +0000
summary:   Added signature for changeset 11ed6ecc0a19

details:   https://code.openbravo.com/erp/devel/main/rev/7a40b4679b72
changeset: 24019:7a40b4679b72
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Tue Aug 05 05:14:45 2014 +0000
summary:   Merge temporary head for 3.0PR14Q2.5

diffstat:

 .hgsigs                                                                        
                                                                                
           |      8 +
 .hgtags                                                                        
                                                                                
           |      8 +
 lib/README                                                                     
                                                                                
           |      1 +
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.class
                                |      0 
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders.class
                                                   |      0 
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class
                                               |      0 
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetail.class
                                            |      0 
 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetailData.class
                                        |      0 
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
                                                                     |     88 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
                                                                     |     12 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/C_ORDER.xml
                                                                                
     |      9 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml
                                                                     |     15 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
                                                                                
      |     38 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml  
                                                                                
           |   1150 +-
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml 
                                                                                
           |    464 +-
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml   
                                                                                
           |    881 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELDGROUP.xml
                                                                                
         |     40 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml    
                                                                                
           |     15 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml 
                                                                                
           |     60 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml  
                                                                                
           |      4 +-
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
  |      4 +-
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml 
                                                                                
           |     24 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
                                                                                
          |    156 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml 
                                                                                
          |    110 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml     
                                                                                
           |    156 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml   
                                                                                
           |    110 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml 
                                                                                
          |     11 +
 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml  
                                                                                
           |     51 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
                                                                                
     |    920 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
                                                                                
       |     24 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
                                                                                
    |     27 +
 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
                                                                                
      |    109 +
 
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql
                 |     47 +-
 
modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.java
              |     49 +-
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders.java
                                        |     84 +
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders_data.xsql
                                   |    148 +
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetail.java
                                 |     45 +
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetail_data.xsql
                            |     87 +
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.java
                                |    459 +
 
modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetailData.java
                         |    280 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/APRMApplicationProvider.java
                                                                        |      
2 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
                                                          |    640 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java
                                                 |    112 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java
                                          |    121 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
                                                              |    475 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
                                                          |     87 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
                                                                 |     30 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.java
                                                                |      5 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java
                                                                 |    115 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java
                                                                |     24 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml
                                                               |      4 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpression.java
                                             |    109 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddOrderOrInvoiceFilterExpressionHandler.java
                                      |    114 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesExpression.java
                                             |    172 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java
                                                |    232 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddOrderOrInvoiceFilterExpresion.java
                                     |     42 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentInAddPaymentDefaultValues.java
                                              |    153 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddOrderOrInvoiceFilterExpresion.java
                                    |     42 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PaymentOutAddPaymentDefaultValues.java
                                             |    164 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddOrderOrInvoiceFilterExpresion.java
                               |     42 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseInvoiceAddPaymentDefaultValues.java
                                        |    137 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddOrderOrInvoiceFilterExpresion.java
                                 |     42 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDefaultValues.java
                                          |    141 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddOrderOrInvoiceFilterExpresion.java
                                  |     42 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesInvoiceAddPaymentDefaultValues.java
                                           |    137 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddOrderOrInvoiceFilterExpresion.java
                                    |     42 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/SalesOrderAddPaymentDefaultValues.java
                                             |    141 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentCreditToUseInjector.java
                                                    |     51 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentGLItemInjector.java
                                                         |     18 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java
                                               |    555 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
                                                                         |    
302 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
                                                                     |      8 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
                                                                     |    262 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
                                                                 |     90 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/RecordID2Filling.java
                                                                       |    460 
+
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMApplicationInitializer.java
                                                             |     55 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMConstants.java
                                                                          |     
29 +
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
                                                                            |   
  81 +-
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
                                                                            |   
 805 +
 
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js
                                                                             |  
   12 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml       
                                                                                
           |      4 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
       |      2 +-
 
modules/org.openbravo.client.application/src-db/database/model/modifiedTables/AD_FIELD.xml
                                                                                
|      4 +
 
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PARAMETER.xml
                                                                               
|     24 +-
 
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS.xml
                                                                                
 |     13 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
                                                                                
         |    360 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
                                                                                
        |    137 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
                                                                                
          |    286 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml 
                                                                                
          |      8 +
 
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
                                                                                
         |      4 +-
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                              | 
     8 +-
 
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 
                                                                                
           |     30 +
 
modules/org.openbravo.client.application/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml
                                                                                
|     13 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
                                                           |      6 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationConstants.java
                                                                   |      4 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
                                                                       |     11 
+-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/DeleteImageActionHandler.java
                                                               |     69 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
                                                                             |  
   10 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java
                                                         |    117 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java
                                          |      6 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl
                                   |      3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java
                                                       |     55 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/DefaultsProcessActionHandler.java
                                                   |    246 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl
                                                     |     28 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-tab.js.ftl
                                               |      4 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-window.js.ftl
                                            |     18 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-tree-grid.js.ftl
                                                               |      2 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
                                                              |     10 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
                                                                |     11 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
                                                     |     38 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ImagesActionHandler.java
                                                             |     45 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBTreeGridComponent.java
                                                             |     21 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
                                                              |     97 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java
                                                          |    107 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
                                                                       |     57 
+-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java
                                                                      |     57 
+-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ParameterWindowComponent.java
                                                        |     16 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
                                                        |      2 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
                                                    |     11 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
                                                   |     10 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
                                                       |     13 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js
                                                        |      7 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
                                               |      6 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
                                                      |     11 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
                                                |    131 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-richtext.js
                                                    |     15 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js
                                                        |     11 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
                                                        |     10 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js
                                                 |      2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
                                                        |      4 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-onchange-registry.js
                                                             |      7 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
                                                                     |     49 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
                                                                          |     
16 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js
                                                                     |      5 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js
                                                                |     12 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
                                                                     |     62 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
                                                                 |    339 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
                                                               |     36 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
                                                                           |    
 28 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js
                                                            |     17 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js
                                                                |     31 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js
                                                       |    202 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js
                                                      |     71 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
                                                      |    338 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
                                                      |    224 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js
                                                      |     48 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
                                                              |      2 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
                                                                    |     58 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js
                                                     |     34 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js
                                                           |     73 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
                                                         |     76 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
                                                                |     16 +
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css
          |     61 +
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
           |     17 +
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js
 |      5 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
          |      4 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                               
|      2 +-
 
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
                                                                                
  |     12 +
 modules/org.openbravo.client.kernel/jslint/jscheck                             
                                                                                
           |      9 +
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MENU.xml     
                                                                                
           |      2 +
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml   
                                                                                
           |      4 +-
 
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
   |      6 +-
 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TAB.xml      
                                                                                
           |      8 +
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
                                                                                
    |      2 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/AbsoluteTimeUIDefinition.java
                                                               |     10 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
                                                                       |     13 
+-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
                                                                    |      9 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKTreeUIDefinition.java
                                                                     |      2 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TimeUIDefinition.java
                                                                       |     10 
+-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
                                                                           |    
108 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MENU.xml       
                                                                                
           |      3 +
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml     
                                                                                
           |      4 +-
 
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
     |      4 +-
 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TAB.xml        
                                                                                
           |     26 +
 
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
                                                                                
      |     21 +-
 
modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-myopenbravo-styles.js
                  |      5 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml 
                                                                                
          |      4 +-
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
|      2 +-
 modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_TAB.xml   
                                                                                
           |      6 +
 
modules/org.openbravo.client.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
                                                                                
   |     76 +
 
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-view.js
                                                                         |      
3 +-
 
modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js
                                                                       |      5 
+-
 modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml  
                                                                                
           |      4 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
  |      2 +-
 
modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
                                                                                
     |     46 +
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MENU.xml
                                                                                
      |      1 +
 
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
    |      4 +-
 
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
                                        |      6 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MENU.xml
                                                                               
|      1 +
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
                                                                             |  
    4 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                  |      2 +-
 
modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.jrxml
                    |   1496 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MENU.xml 
                                                                                
          |      1 +
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
         |      4 +-
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                              | 
    10 +-
 modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_TAB.xml 
                                                                                
           |      4 +
 
modules/org.openbravo.service.datasource/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml
                                                                                
|     16 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java
                                                                |      3 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ComboTableDatasourceService.java
                                                            |    235 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceComponent.java
                                                                    |     11 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java
                                                              |      5 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceUtils.java
                                                                        |     
65 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java
                                                               |      3 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java
                                                                   |    629 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java
                                                      |     30 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java
                                                              |     42 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java
                                                                  |     44 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/hql/HQLInserterQualifier.java
                                                               |     71 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/hql/HqlInserter.java
                                                                        |     
46 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/hql/HqlQueryPriorityHandler.java
                                                            |     42 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/hql/HqlQueryTransformer.java
                                                                |     59 +
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/templates/datasource.ftl
                                                                    |     14 +-
 
modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js
                                                               |     11 +
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MENU.xml
                                                                                
   |      2 +
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
 |      4 +-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                      |      4 
+-
 
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TAB.xml
                                                                                
    |      2 +
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
 |      4 +-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                      |      2 
+-
 
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TAB.xml
                                                                                
    |      2 +
 modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MESSAGE.xml   
                                                                                
           |     12 +
 modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml    
                                                                                
           |      4 +-
 
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
    |      2 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
                                                                               
|     98 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
                                                                             |  
   54 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonConstants.java
                                                                                
      |      3 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
     |      4 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                          |     
12 +-
 
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_TAB.xml
                                                                                
        |      8 +
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
                                                  |     41 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponentProvider.java
                                                      |      6 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
                                                       |     10 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
                                               |      4 +-
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-formitem-fk-combo.js
                                                          |    187 +
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
                                                              |     69 +-
 
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
                                                            |      6 +-
 
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
                                                                            |   
   4 +-
 
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
                                                                                
  |      4 +-
 
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                       |      6 
+-
 
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js
                                                    |      2 +-
 
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
                                                          |      9 +-
 modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml     
                                                                                
           |      4 +-
 
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    
                                                                                
           |      4 +-
 
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
    |     24 +-
 modules/org.openbravo.v3/src-db/database/configScript.xml                      
                                                                                
           |     26 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml              
                                                                                
           |      4 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml   
                                                                                
           |     18 +-
 referencedata/sampledata/F_B_International_Group/AD_ALERT.xml                  
                                                                                
           |    170 +
 referencedata/sampledata/F_B_International_Group/AD_ALERTRECIPIENT.xml         
                                                                                
           |    196 +
 referencedata/sampledata/F_B_International_Group/AD_ALERTRULE.xml              
                                                                                
           |     16 +
 referencedata/sampledata/F_B_International_Group/AD_CLIENT.xml                 
                                                                                
           |     12 +-
 referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml              
                                                                                
           |   2820 +
 referencedata/sampledata/F_B_International_Group/AD_PINSTANCE_PARA.xml         
                                                                                
           |   2312 +
 referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml         
                                                                                
           |    140 +
 referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml        
                                                                                
           |   1041 +-
 referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml               
                                                                                
           |     62 +-
 referencedata/sampledata/F_B_International_Group/AD_USER.xml                   
                                                                                
           |     48 +-
 referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml          
                                                                                
           |    420 +
 referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml                
                                                                                
           |    116 +-
 referencedata/sampledata/F_B_International_Group/C_INVOICE.xml                 
                                                                                
           |  81695 +++++----
 referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml             
                                                                                
           |   5748 +
 referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml          
                                                                                
           |   2808 +
 referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml              
                                                                                
           |   1020 +
 referencedata/sampledata/F_B_International_Group/C_ORDER.xml                   
                                                                                
           |   2214 +
 referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml               
                                                                                
           |   5994 +
 referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml            
                                                                                
           |   2244 +
 referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml                
                                                                                
           |    576 +
 referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml          
                                                                                
           |    180 +
 referencedata/sampledata/F_B_International_Group/C_PERIOD.xml                  
                                                                                
           |     48 +-
 referencedata/sampledata/F_B_International_Group/C_PERIODCONTROL.xml           
                                                                                
           |   1776 +-
 referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml                 
                                                                                
           |  53435 +++++-
 referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml         
                                                                                
           |     44 +
 referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml     
                                                                                
           |   1260 +
 referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml    
                                                                                
           |   1827 +
 referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml     
                                                                                
           |      8 +-
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml               
                                                                                
           |   2157 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml        
                                                                                
           |    944 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml      
                                                                                
           |    174 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml   
                                                                                
           |    660 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml      
                                                                                
           |   2374 +-
 
referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml 
                                                                                
          |   1259 +-
 referencedata/sampledata/F_B_International_Group/FIN_RECLINE_TEMP.xml          
                                                                                
           |    490 +
 referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml        
                                                                                
           |     60 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml                
                                                                                
           |    105 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml           
                                                                                
           |     78 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml            
                                                                                
           |   1260 +
 referencedata/sampledata/F_B_International_Group/M_COSTING.xml                 
                                                                                
           |   1368 +-
 referencedata/sampledata/F_B_International_Group/M_INOUT.xml                   
                                                                                
           |   1530 +
 referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml               
                                                                                
           |   2586 +
 referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml                
                                                                                
           |   1026 +
 referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml                 
                                                                                
           |   2052 +
 referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml          
                                                                                
           |     58 +-
 referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml         
                                                                                
           |     36 +-
 referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml             
                                                                                
           |   3240 +
 referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml        
                                                                                
           |   1800 +
 referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml    
                                                                                
           |    280 +
 src-db/database/model/functions/C_GETINVOICESTATUSFROMSHIPMENT.xml             
                                                                                
           |      3 +
 src-db/database/model/functions/C_INVOICE_CREATE.xml                           
                                                                                
           |      2 +-
 src-db/database/model/functions/C_INVOICE_POST.xml                             
                                                                                
           |      6 +-
 src-db/database/model/functions/C_ORDER_POST1.xml                              
                                                                                
           |    247 +-
 src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml                  
                                                                                
           |     19 +-
 src-db/database/model/functions/MA_PRODUCTION_COST.xml                         
                                                                                
           |     17 +-
 src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml                     
                                                                                
           |     83 +-
 src-db/database/model/functions/MRP_REQUISITION.xml                            
                                                                                
           |      7 +-
 src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml                       
                                                                                
           |     44 +-
 src-db/database/model/functions/M_INOUT_CREATE.xml                             
                                                                                
           |     18 +-
 src-db/database/model/functions/M_INOUT_POST.xml                               
                                                                                
           |     64 +-
 src-db/database/model/functions/M_PRICELIST_CREATE.xml                         
                                                                                
           |     18 +-
 src-db/database/model/functions/M_REQUISITIONLINE_STATUS.xml                   
                                                                                
           |     10 +-
 src-db/database/model/postscript-Oracle.sql                                    
                                                                                
           |      2 +-
 src-db/database/model/tables/AD_COLUMN.xml                                     
                                                                                
           |      4 +
 src-db/database/model/tables/AD_FIELD.xml                                      
                                                                                
           |      4 +
 src-db/database/model/tables/AD_MENU.xml                                       
                                                                                
           |      5 +
 src-db/database/model/tables/AD_SESSION.xml                                    
                                                                                
           |      3 -
 src-db/database/model/tables/AD_TAB.xml                                        
                                                                                
           |     14 +
 src-db/database/model/tables/AD_TABLE.xml                                      
                                                                                
           |     13 +-
 src-db/database/model/tables/AD_TABLE_TREE.xml                                 
                                                                                
           |      4 +
 src-db/database/model/tables/C_BPARTNER.xml                                    
                                                                                
           |     11 +
 src-db/database/model/tables/FACT_ACCT.xml                                     
                                                                                
           |     10 +
 src-db/database/model/tables/M_REQUISITIONORDER.xml                            
                                                                                
           |      5 +-
 src-db/database/model/triggers/AD_TABLE_TRG.xml                                
                                                                                
           |      6 +-
 src-db/database/model/triggers/C_INVOICE_REVERSE_TRG.xml                       
                                                                                
           |      8 +-
 src-db/database/model/triggers/C_ORDERLINE2_TRG.xml                            
                                                                                
           |     84 +-
 src-db/database/model/triggers/C_ORDERLINE_TRG.xml                             
                                                                                
           |     31 +-
 src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml                       
                                                                                
           |      7 +-
 src-db/database/model/triggers/M_REQUISITIONORDER_TRG.xml                      
                                                                                
           |     10 +-
 src-db/database/model/triggers/M_REQUISITION_TRG.xml                           
                                                                                
           |     21 +-
 src-db/database/model/views/M_PRODUCT_PRICE_WAREHOUSE_V.xml                    
                                                                                
           |      2 +-
 src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml                        
                                                                                
           |      2 +-
 src-db/database/sourcedata/AD_AUXILIARINPUT.xml                                
                                                                                
           |     65 +-
 src-db/database/sourcedata/AD_CALLOUT.xml                                      
                                                                                
           |     20 +
 src-db/database/sourcedata/AD_COLUMN.xml                                       
                                                                                
           |    494 +-
 src-db/database/sourcedata/AD_DATASET_TABLE.xml                                
                                                                                
           |    125 +
 src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml                            
                                                                                
           |    546 +
 src-db/database/sourcedata/AD_ELEMENT.xml                                      
                                                                                
           |    177 +-
 src-db/database/sourcedata/AD_FIELD.xml                                        
                                                                                
           |    451 +-
 src-db/database/sourcedata/AD_MENU.xml                                         
                                                                                
           |    387 +
 src-db/database/sourcedata/AD_MESSAGE.xml                                      
                                                                                
           |     96 +
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml                                 
                                                                                
           |     24 +
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml                         
                                                                                
           |     20 +
 src-db/database/sourcedata/AD_MODULE.xml                                       
                                                                                
           |      4 +-
 src-db/database/sourcedata/AD_PROCESS.xml                                      
                                                                                
           |      2 +-
 src-db/database/sourcedata/AD_REFERENCE.xml                                    
                                                                                
           |     36 +
 src-db/database/sourcedata/AD_REF_LIST.xml                                     
                                                                                
           |     44 +
 src-db/database/sourcedata/AD_TAB.xml                                          
                                                                                
           |   1204 +-
 src-db/database/sourcedata/AD_TABLE_TREE.xml                                   
                                                                                
           |     18 +
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml                               
                                                                                
           |     11 +
 src-db/database/sourcedata/AD_VAL_RULE.xml                                     
                                                                                
           |     46 +-
 src-db/database/sourcedata/OBUIAPP_PARAMETER.xml                               
                                                                                
           |    175 +
 src-db/database/sourcedata/OBUIAPP_PROCESS.xml                                 
                                                                                
           |     51 +
 src-db/database/sourcedata/OBUISEL_SELECTOR.xml                                
                                                                                
           |     34 +-
 src-test/org/openbravo/test/AllAntTaskTests.java                               
                                                                                
           |      4 +
 src-test/org/openbravo/test/AllWebserviceTests.java                            
                                                                                
           |      8 +
 src-test/org/openbravo/test/accounting/RecordID2Test.java                      
                                                                                
           |    668 +
 src-test/org/openbravo/test/dal/DalQueryTest.java                              
                                                                                
           |     46 +-
 src-test/org/openbravo/test/dal/DalTest.java                                   
                                                                                
           |     70 +-
 src-test/org/openbravo/test/dal/DynamicEntityTest.java                         
                                                                                
           |     25 +-
 src-test/org/openbravo/test/dal/HiddenUpdateTest.java                          
                                                                                
           |      8 +-
 src-test/org/openbravo/test/dal/ReadByNameTest.java                            
                                                                                
           |     27 +-
 src-test/org/openbravo/test/datasource/BaseDataSourceTestDal.java              
                                                                                
           |    110 +
 src-test/org/openbravo/test/datasource/BaseDataSourceTestNoDal.java            
                                                                                
           |    110 +
 src-test/org/openbravo/test/datasource/DatasourceTestUtil.java                 
                                                                                
           |    143 +
 src-test/org/openbravo/test/datasource/ProductSelectorDataSourceTest.java      
                                                                                
           |     90 +
 
src-test/org/openbravo/test/datasource/SelectorFieldPropertySelectorDSTest.java 
                                                                                
          |    163 +
 src-test/org/openbravo/test/datasource/TestCSVEncoding.java                    
                                                                                
           |    135 +
 src-test/org/openbravo/test/datasource/TestComboDatasource.java                
                                                                                
           |    264 +
 src-test/org/openbravo/test/modularity/DBPrefixTest.java                       
                                                                                
           |     40 +-
 src-test/org/openbravo/test/modularity/TableNameTest.java                      
                                                                                
           |     37 +-
 src-test/org/openbravo/test/preference/PreferenceTest.java                     
                                                                                
           |     90 +-
 src-test/org/openbravo/test/security/EntityAccessTest.java                     
                                                                                
           |     31 +-
 src-test/org/openbravo/test/webservice/WSUpdateTest.java                       
                                                                                
           |     38 +-
 src-test/org/openbravo/test/xml/EntityXMLImportTestBusinessObject.java         
                                                                                
           |     48 +-
 src-test/org/openbravo/test/xml/UniqueConstraintImportTest.java                
                                                                                
           |     16 +-
 
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeBPCurrency.class
                                                                                
 |      0 
 
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeBPCurrencyData.class
                                                                             |  
    0 
 src-util/modulescript/src/org/openbravo/modulescript/InitializeBPCurrency.java 
                                                                                
           |     44 +
 
src-util/modulescript/src/org/openbravo/modulescript/InitializeBPCurrency_data.xsql
                                                                                
       |     70 +
 src/index.jsp                                                                  
                                                                                
           |      9 +
 src/org/openbravo/base/gen/GenerateEntitiesTask.java                           
                                                                                
           |      7 +-
 src/org/openbravo/base/model/Entity.java                                       
                                                                                
           |     16 +-
 src/org/openbravo/base/model/ModelProvider.java                                
                                                                                
           |     28 +-
 src/org/openbravo/base/secureApp/AdvisePopUp.html                              
                                                                                
           |      4 +-
 src/org/openbravo/base/secureApp/AdvisePopUp.xml                               
                                                                                
           |      3 +-
 src/org/openbravo/base/secureApp/HttpSecureAppServlet.java                     
                                                                                
           |     24 +-
 src/org/openbravo/base/secureApp/PopUp_DownloadAndRefresh.xml                  
                                                                                
           |      3 +
 src/org/openbravo/common/actionhandler/CopyProcessPlanVersion.java             
                                                                                
           |    193 +
 src/org/openbravo/common/actionhandler/SetNewBPCurrency.java                   
                                                                                
           |    150 +
 src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java   
                                                                                
           |    164 +-
 src/org/openbravo/costing/CostingMigrationProcess.java                         
                                                                                
           |      4 +-
 src/org/openbravo/dal/core/DalUtil.java                                        
                                                                                
           |     12 +-
 src/org/openbravo/erpCommon/ad_actionButton/ActionButtonUtility.java           
                                                                                
           |      3 +-
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java               
                                                                                
           |     86 +-
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder_data.xsql          
                                                                                
           |      6 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java                    
                                                                                
           |     13 +-
 src/org/openbravo/erpCommon/ad_callouts/SE_InOut_Organization.java             
                                                                                
           |     63 +
 src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java                 
                                                                                
           |      5 +
 src/org/openbravo/erpCommon/ad_callouts/SE_Order_Organization.java             
                                                                                
           |     35 +-
 src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod_FinAccount.java       
                                                                                
           |     71 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java                      
                                                                                
           |     28 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_Production_Product.java             
                                                                                
           |      3 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_RequisitionLine_Product.java        
                                                                                
           |      8 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_TableTab.java                       
                                                                                
           |     47 +
 src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java                     
                                                                                
           |      7 +
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java                           
                                                                                
           |      6 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java              
                                                                                
           |     15 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java                        
                                                                                
           |     10 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java                 
                                                                                
           |     16 +-
 src/org/openbravo/erpCommon/ad_forms/DocInventory.java                         
                                                                                
           |     10 +
 src/org/openbravo/erpCommon/ad_forms/DocInvoice.java                           
                                                                                
           |     10 +-
 src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql                      
                                                                                
           |     18 +-
 
src/org/openbravo/erpCommon/ad_forms/DocLineCashVATReady_PaymentTransactionReconciliation.java
                                                                            |   
   9 +-
 src/org/openbravo/erpCommon/ad_forms/DocLineProduction_data.xsql               
                                                                                
           |      3 +-
 src/org/openbravo/erpCommon/ad_forms/DocProduction.java                        
                                                                                
           |     13 +-
 src/org/openbravo/erpCommon/ad_forms/FactLine.java                             
                                                                                
           |      6 +
 src/org/openbravo/erpCommon/ad_forms/FactLine_data.xsql                        
                                                                                
           |     25 +
 src/org/openbravo/erpCommon/ad_process/AlertProcess.java                       
                                                                                
           |     41 +-
 src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java          
                                                                                
           |     69 +-
 src/org/openbravo/erpCommon/ad_process/PriceListCreateAll.java                 
                                                                                
           |      5 +-
 src/org/openbravo/erpCommon/ad_process/PriceListCreateAll_data.xsql            
                                                                                
           |      4 +-
 src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml                 
                                                                                
           |     36 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html                
                                                                                
           |      3 +
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java                
                                                                                
           |     45 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml                 
                                                                                
           |      2 +
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java         
                                                                                
           |     18 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml        
                                                                                
           |     37 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql           
                                                                                
           |      2 +
 src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.jrxml           
                                                                                
           |     17 +-
 src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql          
                                                                                
           |      4 +-
 src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml      
                                                                                
           |     34 +
 src/org/openbravo/erpCommon/ad_reports/WeightDimensionalNoComparative.jrxml    
                                                                                
           |     15 +
 src/org/openbravo/erpCommon/businessUtility/COAUtility.java                    
                                                                                
           |      6 +-
 src/org/openbravo/erpCommon/security/SessionListener.java                      
                                                                                
           |     87 +-
 src/org/openbravo/erpCommon/security/SessionLogin_data.xsql                    
                                                                                
           |     32 +-
 src/org/openbravo/erpCommon/utility/CashVATUtil.java                           
                                                                                
           |    121 +-
 src/org/openbravo/erpCommon/utility/ComboTableData.java                        
                                                                                
           |    126 +-
 src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java               
                                                                                
           |     20 +-
 src/org/openbravo/erpCommon/utility/ImageUtils.java                            
                                                                                
           |     58 +-
 src/org/openbravo/erpCommon/utility/SystemInfo.java                            
                                                                                
           |      2 +-
 src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml                          
                                                                                
           |      1 +
 src/org/openbravo/event/ADTableEventHandler.java                               
                                                                                
           |      8 +-
 src/org/openbravo/event/BusinessPartnerEventHandler.java                       
                                                                                
           |     69 +
 src/org/openbravo/financial/ResetAccounting.java                               
                                                                                
           |     17 +-
 src/org/openbravo/service/system/DatabaseValidator.java                        
                                                                                
           |      9 +-
 src/org/openbravo/service/system/SystemService.java                            
                                                                                
           |      4 +-
 449 files changed, 170676 insertions(+), 49945 deletions(-)

diffs (truncated from 311553 to 300 lines):

diff -r 73f3bc31a229 -r 7a40b4679b72 .hgsigs
--- a/.hgsigs   Thu Jul 17 05:55:36 2014 +0000
+++ b/.hgsigs   Tue Aug 05 05:14:45 2014 +0000
@@ -145,3 +145,11 @@
 2cbbd8417ae97c721014374b56300f9359801fc2 0 
iEYEABECAAYFAlLX0sMACgkQCX/oGf+2qkPBDgCeOEYN+sAUu4baZ1tz3jNaubocaCcAoL/oSf0PxmUybuQg3kMSTINTsbOt
 43f6f77b25a9c7d51084945606d9047edc330fd9 0 
iEYEABECAAYFAlL8iUMACgkQCX/oGf+2qkNl7ACfSjVPsngbBzCPO8LvR265DeT4c/QAni8NT/G2mfMPQIToawozPiOKNtQl
 798fae4fdaf127b043499f76df3decadaf36ba62 0 
iEYEABECAAYFAlMOzmsACgkQCX/oGf+2qkOFaACeNhkWHX9QfZ2zhxYiyjgbjenzvnkAoIb5zBld70lqFa7N0rOsf32Rb0Lo
+54ac6316c5c34c5eb2c4dfa95a504b3ecd5a33cb 0 
iEYEABECAAYFAlNw/70ACgkQCX/oGf+2qkMO1wCfbXNv+SWd0NrkIw75mUSyu31zi6cAnRgI/Rj3MoUIu7VDDBhLbZnq21OR
+edac701bed6828715cff776651dac79d309674ca 0 
iEYEABECAAYFAlOWq2kACgkQCX/oGf+2qkOzsQCfQUbf6PPjT2hXJz31XB7Wnn6vXUUAn0BB3aVsVa2uqv+VxNdO1GlAd+MN
+82edc3e63e3d23403efb378924c8e8f991c73cfc 0 
iEYEABECAAYFAlNjfr0ACgkQCX/oGf+2qkPLVwCgowJ6SZ7/i3HJzN7KzIEqRxY60+MAoJbXOSIqx3xHRoG/yeZSdSST8zIV
+7de34ade782eae3f74b2df2471292e0da145eb47 0 
iEYEABECAAYFAlN95g4ACgkQCX/oGf+2qkO62ACg74llt2Ngb7UyteX/drSuZ6/U8mIAn2I3sFYMtTZ3jzjR5zGOJ3M8/Ah0
+e6d5de2bb5e230b5a9d6d95489292a8e92de1764 0 
iEYEABECAAYFAlOhX0gACgkQCX/oGf+2qkOgGACg3wrp9HA+P7exN/j+Znu5acph2psAn1XulrvCL3RJ0r2iNyeVqaY73OtQ
+79d26cfa1fe16e6ba26251919588218073d8682f 0 
iEYEABECAAYFAlOrwz0ACgkQCX/oGf+2qkOPlQCfV15XdSozD91qAF751lOUOH3VwroAn08TYpciEyWBOxsFXend1IUEPsnA
+9607751357e9e3a411c0919759ed81196befcad9 0 
iEYEABECAAYFAlPHZVkACgkQCX/oGf+2qkORBQCfZJPiBWcEMNURibADGn9o+u+snwgAoP4ZMSkLCsu4PSf75rZn4gStM4wh
+11ed6ecc0a194545a1f8a3af2b2674b0ec319f99 0 
iEYEABECAAYFAlPblXoACgkQCX/oGf+2qkOuxACfX5e+wRgLJw88VUyHl32C+QC8PY8AoOoARsJUAOnu8IgYYwNjyw5xMlKC
diff -r 73f3bc31a229 -r 7a40b4679b72 .hgtags
--- a/.hgtags   Thu Jul 17 05:55:36 2014 +0000
+++ b/.hgtags   Tue Aug 05 05:14:45 2014 +0000
@@ -156,3 +156,11 @@
 e6661b2604e820c2df1269029e688e49d611a1e7 3.0MP31
 510340c73c5073cf20afd52a02e411cebdc017f6 3.0MP31.1
 3044ba5dda0c5f188fbea125287005ef4b06ee76 3.0MP31.2
+70267e407fec28ae0268e89686dfe6e551614d16 3.0MP31.3
+8f75794bc0d9e07225605892bb036f89f82070b0 3.0MP31.4
+2dac23c5332cf7fab337385841dcd65e9eaf78c0 3.0PR14Q2
+6b79b2cff11381014860b41d7db9c3835c87069b 3.0PR14Q2.1
+10a75a864b9d99c5f92d913f6d29255a5b0241cb 3.0PR14Q2.2
+623357e87f6cc274e2b75b2eda60d11dd0c593d2 3.0PR14Q2.3
+73f3bc31a2293109ebdc6e5b2f8b3f1870df7528 3.0PR14Q2.4
+abfe5a20ef579b8edaf9866346ee876a00e87eee 3.0PR14Q2.5
diff -r 73f3bc31a229 -r 7a40b4679b72 lib/README
--- a/lib/README        Thu Jul 17 05:55:36 2014 +0000
+++ b/lib/README        Tue Aug 05 05:14:45 2014 +0000
@@ -1,3 +1,4 @@
 When adding or removing libraries to Openbravo ERP please update this page
 with your changes:
 http://wiki.openbravo.com/wiki/Openbravo_Libraries
+
diff -r 73f3bc31a229 -r 7a40b4679b72 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.class
 has changed
diff -r 73f3bc31a229 -r 7a40b4679b72 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders.class
 has changed
diff -r 73f3bc31a229 -r 7a40b4679b72 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class
 has changed
diff -r 73f3bc31a229 -r 7a40b4679b72 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetail.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetail.class
 has changed
diff -r 73f3bc31a229 -r 7a40b4679b72 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetailData.class
Binary file 
modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdatePaymentScheduledetailData.class
 has changed
diff -r 73f3bc31a229 -r 7a40b4679b72 
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 Jul 17 05:55:36 2014 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
     Tue Aug 05 05:14:45 2014 +0000
@@ -32,6 +32,7 @@
 V_OutstandingAmount NUMBER;
 V_DueAmount NUMBER;
 V_DayStillDue NUMBER;
+v_ConvertedAmount NUMBER;
 
 v_Client_ID VARCHAR2(32);
 v_Org_ID VARCHAR2(32);
@@ -43,6 +44,7 @@
 v_PaymentTerm C_INVOICE.C_PaymentTerm_ID%TYPE;
 v_PaymentRule C_INVOICE.PaymentRule%TYPE;
 v_Currency_ID VARCHAR2(32);
+v_bpCurrency_id VARCHAR2(32);
 v_BPartner_ID VARCHAR2(32);
 v_DateInvoiced DATE;
 v_TotalLines NUMBER;
@@ -136,6 +138,20 @@
     v_creditmultiplier := -1;
   END IF;
 
+  --Gets the business partner's currency
+  SELECT BP_Currency_ID
+  INTO v_bpCurrency_id
+  from C_BPartner
+  WHERE C_BPartner_ID = v_BPartner_ID;
+  
+  IF (v_bpCurrency_id is null) THEN
+    v_bpCurrency_id:= v_Currency_ID;
+
+    update c_bpartner
+    set BP_Currency_ID = v_bpCurrency_id
+    where c_bpartner_id =v_BPartner_ID;
+  END IF;
+
   -- complete invoice
   IF (p_docaction = 'CO') THEN
     -- Checking Payment Method ID is available
@@ -438,7 +454,7 @@
               --When difference amount is not 0 the payment schedule detail of 
the order has to be split. The difference
               --amount is the amount of the new psd that is not related to any 
invoice.
 
-              IF (v_differenceamount > 0) THEN
+              IF (v_differenceamount * v_negativePS > 0) THEN
                 v_new_scheduledetailid := get_uuid();
                 INSERT INTO fin_payment_scheduledetail
                 (
@@ -595,8 +611,29 @@
       WHERE C_INVOICE_ID = P_RECORD_ID;
 
       -- Updating SO_CREDITUSED when Invoices are being processed
+      if(v_bpCurrency_id <> v_Currency_id) THEN
+        SELECT COUNT(*)
+        INTO v_Count
+        FROM C_Conversion_Rate_Document
+        WHERE C_Invoice_ID = P_RECORD_ID
+        AND C_Currency_ID = v_Currency_id
+        AND C_Currency_Id_To = v_bpCurrency_id;
+
+        IF v_Count >0 THEN
+          SELECT RATE*COALESCE(V_OutstandingAmount, 0) * v_creditmultiplier
+          INTO v_ConvertedAmount
+          FROM C_Conversion_Rate_Document
+          WHERE C_Invoice_ID = P_RECORD_ID
+          AND C_Currency_ID = v_Currency_id
+          AND C_Currency_Id_To = v_bpCurrency_id;        
+        ELSE
+          v_ConvertedAmount := 
C_Currency_Convert((COALESCE(V_OutstandingAmount, 0) * v_creditmultiplier), 
v_Currency_id, v_bpCurrency_id, v_DateInvoiced,'S', v_Client_ID, v_Org_ID);
+        END IF;
+      else
+        v_ConvertedAmount := COALESCE(V_OutstandingAmount, 0) * 
v_creditmultiplier;
+      end if;
       UPDATE C_BPARTNER
-      SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + 
(COALESCE(V_OutstandingAmount, 0) * v_creditmultiplier)
+      SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount
       WHERE C_BPARTNER_ID = v_BPartner_ID;
 
       -- Automatic creation of payment and financial transaction
@@ -923,8 +960,29 @@
                 WHERE C_INVOICE_ID = P_RECORD_ID
                   AND TOTALPAID = GRANDTOTAL;
                 -- Updating SO_CREDITUSED when PAYMENT OCCUR and is not set in 
RPAE status
+                if (v_bpCurrency_id <> v_Currency_id) then
+                  SELECT COUNT(*)
+                  INTO v_Count
+                  FROM C_Conversion_Rate_Document
+                  WHERE C_Invoice_ID = P_RECORD_ID
+                  AND C_Currency_ID = v_Currency_id
+                  AND C_Currency_Id_To = v_bpCurrency_id;
+
+                  IF v_Count >0 THEN
+                    SELECT RATE*(COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 
0) * v_creditmultiplier)
+                    INTO v_ConvertedAmount
+                    FROM C_Conversion_Rate_Document
+                    WHERE C_Invoice_ID = P_RECORD_ID
+                    AND C_Currency_ID = v_Currency_id
+                    AND C_Currency_Id_To = v_bpCurrency_id;
+                  ELSE
+                    v_ConvertedAmount := 
C_Currency_Convert((COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * 
v_creditmultiplier), v_Currency_id, v_bpCurrency_id, v_DateInvoiced,'S', 
v_Client_ID, v_Org_ID);
+                  END IF;  
+                else
+                  v_ConvertedAmount := 
(COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * v_creditmultiplier);
+                end if;
                 UPDATE C_BPARTNER
-                SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - 
(COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * v_creditmultiplier)
+                SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - 
v_ConvertedAmount
                 WHERE C_BPARTNER_ID = v_BPartner_ID;
               END IF;
             END LOOP;
@@ -1023,8 +1081,30 @@
       INTO v_PaidAmount, v_PaymentPlanExpectedTotal
       FROM FIN_PAYMENT_SCHEDULE
       WHERE FIN_PAYMENT_SCHEDULE.C_INVOICE_ID = p_record_id ;
+
+      if v_bpCurrency_id <> v_Currency_id then
+        SELECT COUNT(*)
+        INTO v_Count
+        FROM C_Conversion_Rate_Document
+        WHERE C_Invoice_ID = P_RECORD_ID
+        AND C_Currency_ID = v_Currency_id
+        AND C_Currency_Id_To = v_bpCurrency_id;
+
+        IF v_Count >0 THEN
+          SELECT RATE*((v_PaymentPlanExpectedTotal - v_PaidAmount) * 
v_creditmultiplier)
+          INTO v_ConvertedAmount
+          FROM C_Conversion_Rate_Document
+          WHERE C_Invoice_ID = P_RECORD_ID
+          AND C_Currency_ID = v_Currency_id
+          AND C_Currency_Id_To = v_bpCurrency_id;
+        ELSE
+          v_ConvertedAmount := C_Currency_Convert(((v_PaymentPlanExpectedTotal 
- v_PaidAmount) * v_creditmultiplier), v_Currency_id, v_bpCurrency_id, 
v_DateInvoiced,'S', v_Client_ID, v_Org_ID);
+        END IF;  
+      else
+        v_ConvertedAmount := ((v_PaymentPlanExpectedTotal - v_PaidAmount) * 
v_creditmultiplier);
+      END IF;
       UPDATE C_BPARTNER
-         SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - 
((v_PaymentPlanExpectedTotal - v_PaidAmount) * v_creditmultiplier)
+         SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount
       WHERE C_BPARTNER_ID = v_BPartner_ID;
     END;
 
diff -r 73f3bc31a229 -r 7a40b4679b72 
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 Jul 17 05:55:36 2014 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
     Tue Aug 05 05:14:45 2014 +0000
@@ -39,6 +39,7 @@
 v_docSubType c_doctype.docsubtypeso%TYPE;
 v_PaymentPriority VARCHAR(32);
 v_count NUMBER;
+v_Documentno Fin_Payment.DocumentNo%TYPE;
 
 TYPE RECORD IS REF CURSOR;
 Cur_Params RECORD;
@@ -192,6 +193,17 @@
       IF (v_count <> 0) THEN
         RAISE_APPLICATION_ERROR(-20000, '@APRM_OrderWithPayments@');
       END IF;
+      SELECT count(*), max(p.DocumentNo)
+        INTO v_count, v_DocumentNo
+      FROM fin_payment_schedule ps, fin_payment_scheduledetail psd,
+      fin_payment_detail pd, fin_payment p
+      WHERE ps.fin_payment_schedule_id = psd.fin_payment_schedule_order
+        AND ps.c_order_id = p_record_id
+        AND psd.fin_payment_detail_id = pd.fin_payment_detail_id
+        AND pd.fin_payment_id = p.fin_payment_id;
+      IF (v_count <> 0) THEN
+        RAISE_APPLICATION_ERROR(-20000, 
'@APRM_OrderWithPayments@'||v_DocumentNo);
+      END IF;
       v_resultstr:='Update/Delete scheduled payments details';
       FOR Cur_PaymentScheduleDetail IN (
         SELECT psd.*
diff -r 73f3bc31a229 -r 7a40b4679b72 
modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/C_ORDER.xml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/C_ORDER.xml
     Tue Aug 05 05:14:45 2014 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+  <database name="MODIFIED TABLE C_ORDER">
+    <table name="C_ORDER" primaryKey="C_ORDER_KEY">
+      <column name="EM_APRM_ADDPAYMENT" primaryKey="false" required="false" 
type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+    </table>
+  </database>
diff -r 73f3bc31a229 -r 7a40b4679b72 
modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml
     Thu Jul 17 05:55:36 2014 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_DETAIL_CHECK_TRG.xml
     Tue Aug 05 05:14:45 2014 +0000
@@ -41,9 +41,18 @@
   WHERE FIN_Payment_ID=v_FIN_Payment_ID;
   
   IF (UPDATING) THEN
-       IF (v_Processed='Y') THEN
-       RAISE_APPLICATION_ERROR(-20000, '@20501@');
-       END IF;
+    IF(v_Processed='Y' AND ((COALESCE(:OLD.FIN_PAYMENT_ID, '0') <> 
COALESCE(:NEW.FIN_PAYMENT_ID, '0'))
+      OR(COALESCE(:OLD.AMOUNT, 0) <> COALESCE(:NEW.AMOUNT, 0))
+      OR(COALESCE(:OLD.REFUND, '.') <> COALESCE(:NEW.REFUND, '.'))
+      OR(COALESCE(:OLD.WRITEOFFAMT, 0) <> COALESCE(:NEW.WRITEOFFAMT, 0))
+      OR(COALESCE(:OLD.C_GLITEM_ID, '0') <> COALESCE(:NEW.C_GLITEM_ID, '0'))
+      OR(COALESCE(:OLD.ISPREPAYMENT, '.') <> COALESCE(:NEW.ISPREPAYMENT, '.'))
+      OR(COALESCE(:OLD.FIN_PAYMENT_DETAIL_ID, '0') <> 
COALESCE(:NEW.FIN_PAYMENT_DETAIL_ID, '0'))      
+      OR(COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
+      OR(COALESCE(:OLD.AD_CLIENT_ID, '0') <> COALESCE(:NEW.AD_CLIENT_ID, '0'))
+      )) THEN
+        RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
+    END IF;
   END IF;
           
   IF((DELETING OR INSERTING) AND v_Processed='Y') THEN
diff -r 73f3bc31a229 -r 7a40b4679b72 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
      Thu Jul 17 05:55:36 2014 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
      Tue Aug 05 05:14:45 2014 +0000
@@ -64,6 +64,25 @@
 <!--4FA457B12B4E411FA662D4D97A53B2E1-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--4FA457B12B4E411FA662D4D97A53B2E1--></AD_AUXILIARINPUT>
 
+<!--874CCFB2FE7B40D79D2B0AE27951853F--><AD_AUXILIARINPUT>
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  
<AD_AUXILIARINPUT_ID><![CDATA[874CCFB2FE7B40D79D2B0AE27951853F]]></AD_AUXILIARINPUT_ID>
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  <AD_TAB_ID><![CDATA[294]]></AD_TAB_ID>
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  
<NAME><![CDATA[APRM_OrderIsPaid]]></NAME>
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  <CODE><![CDATA[@SQL=select case when 
ps.outstandingamt > 0 then 'N' else 'Y' end
+          from fin_payment_scheduledetail fpsd
+              join fin_payment_detail fpd on 
fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+              join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+              join fin_payment_schedule ps ON ps.fin_payment_schedule_id = 
fpsd.fin_payment_schedule_order
+              join c_order co on co.c_order_id=ps.c_order_id
+                WHERE ps.c_order_id =@c_order_id@
+                and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40
+                group by co.GrandTotal, ps.outstandingamt, 
ps.c_order_id]]></CODE>
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--874CCFB2FE7B40D79D2B0AE27951853F--></AD_AUXILIARINPUT>
+
 <!--9D630C9E4C734361BFB09B153EEE3BCB--><AD_AUXILIARINPUT>
 <!--9D630C9E4C734361BFB09B153EEE3BCB-->  
<AD_AUXILIARINPUT_ID><![CDATA[9D630C9E4C734361BFB09B153EEE3BCB]]></AD_AUXILIARINPUT_ID>
 <!--9D630C9E4C734361BFB09B153EEE3BCB-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -75,6 +94,25 @@
 <!--9D630C9E4C734361BFB09B153EEE3BCB-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9D630C9E4C734361BFB09B153EEE3BCB--></AD_AUXILIARINPUT>
 
+<!--9FF4321DE0E5487B8A649A444F3F64BC--><AD_AUXILIARINPUT>
+<!--9FF4321DE0E5487B8A649A444F3F64BC-->  
<AD_AUXILIARINPUT_ID><![CDATA[9FF4321DE0E5487B8A649A444F3F64BC]]></AD_AUXILIARINPUT_ID>
+<!--9FF4321DE0E5487B8A649A444F3F64BC-->  
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9FF4321DE0E5487B8A649A444F3F64BC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9FF4321DE0E5487B8A649A444F3F64BC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9FF4321DE0E5487B8A649A444F3F64BC-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
+<!--9FF4321DE0E5487B8A649A444F3F64BC-->  
<NAME><![CDATA[APRM_OrderIsPaid]]></NAME>
+<!--9FF4321DE0E5487B8A649A444F3F64BC-->  <CODE><![CDATA[@SQL=select case when 
ps.outstandingamt > 0 then 'N' else 'Y' end
+          from fin_payment_scheduledetail fpsd

------------------------------------------------------------------------------
Infragistics Professional
Build stunning WinForms apps today!
Reboot your WinForms applications with our WinForms controls. 
Build a bridge from your legacy apps to the future.
http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to