details:   https://code.openbravo.com/erp/devel/main/rev/8d914985ce24
changeset: 33176:8d914985ce24
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Fri Jan 19 14:27:19 2018 +0100
summary:   Related to issue 37685: Fix jslint error by adding missing semicolon

details:   https://code.openbravo.com/erp/devel/main/rev/2980f02e5193
changeset: 33177:2980f02e5193
user:      Inigo Sanchez <inigo.sanchez <at> openbravo.com>
date:      Fri Jan 19 14:27:38 2018 +0100
summary:   Fixed issue 37685: Filter on quick launch menu is not accent 
sensitive

After the changes introduced in the "Improve scalability of the login process" 
project on issue #35553, the quick launch menu no longer used the specific 
datasource. The datasource has a fieldMatchesFilter method that allow searchs 
not distinguish between accent or non-accent words. Since the changes were 
introduced, the data is filter in the client instead of in the datasource and 
for this reason the fieldMatchesFilter method is not executed.

To fix the problem two main actions have been done:
- Small clean code moving the functionality of fieldMatchesFilter method to 
ob-utilities in order to avoid duplicated code.
- The getQuickMenuItems method must be save the identifiers without accents 
using the method previosuly created in ob-utilities. It has been done the same 
with the value returned in the getPickListFilterCriteria method.

Removing the accents in the items of the filter in ob-quick-launch.js the 
problem has been resolved. The accents are now ignored in Quick launch Menu' 
suggestion combobox.

details:   https://code.openbravo.com/erp/devel/main/rev/a4a2c816e686
changeset: 33178:a4a2c816e686
user:      Carlos Aristu <carlos.aristu <at> openbravo.com>
date:      Mon Jan 22 12:49:53 2018 +0100
summary:   related to bug 37685: use title field as the display value for the 
menu entries

  As now the _identifier contains the title text but without accents, it can 
not be used as the display field because in that case it would not be possible 
to show menu entries with accents. For this reason we now use the title field 
as the display field.

details:   https://code.openbravo.com/erp/devel/main/rev/5c530e2d5e8c
changeset: 33179:5c530e2d5e8c
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Wed Jan 24 17:05:02 2018 +0100
summary:   Fixes Issue 37715. "Project Phase" field does not show any value
(although Project is selected) in Expense Sheet window

In callouts, for fields representing Ids, an empty string is returned instead
of null.

details:   https://code.openbravo.com/erp/devel/main/rev/2f93f057375b
changeset: 33180:2f93f057375b
user:      Nono Carballo <nonofce <at> gmail.com>
date:      Mon Jan 22 12:12:44 2018 +0100
summary:   Fixes issue 37069: Movement Qty column info not updated once a 
product with stock
is selected in Goods Shipment if Alt UOM Preference is enable.

Operative Quantity field isautomatically populated if the selected product
do not have a default Alternative UOM configured and the product has
quantity on hand.

details:   https://code.openbravo.com/erp/devel/main/rev/f250da499f9f
changeset: 33181:f250da499f9f
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Mon Jan 22 12:30:04 2018 +0100
summary:   Related to issue 37069: Code Review changes

* Added final modifier to product object again
* Removed unused methods
* When setting the AUM, set also the Quantity expresed in AUM
  and for that, convert the original quantity to the AUM equivalent.

details:   https://code.openbravo.com/erp/devel/main/rev/039bba21b2b5
changeset: 33182:039bba21b2b5
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Wed Jan 24 16:21:27 2018 +0100
summary:   Related to Issue 37069. Change done to reload the qty in stock for a 
product
instead of 0 after the line has been saved

details:   https://code.openbravo.com/erp/devel/main/rev/f66c846ec385
changeset: 33183:f66c846ec385
user:      Nono Carballo <nonofce <at> gmail.com>
date:      Mon Jan 22 12:49:49 2018 +0100
summary:   Fixes issue 37066: RTV shipment (Pick/Edit Lines) not properly 
working if
Returned UOM is changed from Unit to Pallet.

When changing Ship Qty and then returned Uom, just pending field is updated,
showing the pending quantity expressed in returned Uom.

Same behaviour in Return Material Receipt window.

details:   https://code.openbravo.com/erp/devel/main/rev/018323fa0ae3
changeset: 33184:018323fa0ae3
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Mon Jan 29 11:38:22 2018 +0100
summary:   Fixes Issue 37765. Fixes performance in Return Material Receipt P&E

In view m_rm_receipt_pick_edit a new column has been added with the
Business Partner from the Order.

This new column is used in the filter of the Return Material P&E Tab.
By doing so, additional cross joins with OrderLine and Order Tables
are avoided.
Also, the planner in Postgres is able to properly use the Business
Partner index.

details:   https://code.openbravo.com/erp/devel/main/rev/f3e9a7dc364d
changeset: 33185:f3e9a7dc364d
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Fri Jan 19 09:25:37 2018 +0100
summary:   Fixes Issue 37786:Overly huge request size in 
AddPaymentDisplayLogicActionHandle

Before sending the context, the grids with the information about orders and 
invoices,
gl items and credit used are removed from it.
This data is not used for calculating the display or read only logic of the 
rest of the parameters
and sending the grid can have an impact in the performance of this process.

details:   https://code.openbravo.com/erp/devel/main/rev/79e59dce5573
changeset: 33186:79e59dce5573
user:      Armaignac <collazoandy4 <at> gmail.com>
date:      Tue Jan 30 17:11:54 2018 -0500
summary:   Fixes issue 37766: Sales Invoice Dimensional Report in Excel - error 
0/0

A division by zero was taking place when the total amount of the invoice is zero

A validation was added to avoid division by zero when total amount is zero.

details:   https://code.openbravo.com/erp/devel/main/rev/4f6f953c4260
changeset: 33187:4f6f953c4260
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Thu Feb 01 09:53:27 2018 +0100
summary:   Related to Issue 37766. Code review changes.

Changed comparison to work as other outputs (PDF, HTML).
If the totalAmount is zero, then the margin is zero.

details:   https://code.openbravo.com/erp/devel/main/rev/faf1e72a5d99
changeset: 33188:faf1e72a5d99
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Thu Feb 01 12:16:41 2018 +0100
summary:   Fixes Issue 37801. Selector for Product in Work Effort and 
Production Run Windows
does not filter Products by non stocked. It is possible to select a product
regardless of having stock of it. If there is stock, it is possible to select
the specific stock.

details:   https://code.openbravo.com/erp/devel/main/rev/7205d97f45d3
changeset: 33189:7205d97f45d3
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Mon Feb 05 13:38:52 2018 +0100
summary:   fixed issue 37816: Axis services page is always available

   SOAP ws are disabled by default.

details:   https://code.openbravo.com/erp/devel/main/rev/9b96ff21af72
changeset: 33190:9b96ff21af72
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Wed Feb 07 13:05:20 2018 +0100
summary:   Fixes Issue 37774. Adds several indexes that improve performance
in basic operations like deleting an Invoice or an Order

details:   https://code.openbravo.com/erp/devel/main/rev/eadd42437276
changeset: 33191:eadd42437276
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Tue Feb 13 12:06:02 2018 +0100
summary:   fixed bug 37895, fixed bug 37901: incorrect CU handling in 
concurrency and POS

  Concurrent Users management had two different problems:
   * If a backoffice session was reused in POS closing backoffice browser, a CU
     session was counted and it was not deactivated while POS session was 
active.
     In this situation, the session should be deactivated if CU limit has been
     reached.
   * Code for creating and checking active http sessions in context was not 
thread
     safe, so it was possible to get an error when checking if session was 
active while
     other sessions were created/destroyed in paralell. This has been fixed by
     synchronizing on active session set. Having solved previous issue this 
should
     not create excessive contentention as it will be executed only if: CU 
limit has
     been reached and there are sessions created by mobile modules exclude POS.

details:   https://code.openbravo.com/erp/devel/main/rev/3329a5d35ffa
changeset: 33192:3329a5d35ffa
user:      Augusto Mauch <augusto.mauch <at> openbravo.com>
date:      Wed Feb 14 09:40:23 2018 +0100
summary:   Fixes issue 37897: Callouts are invoked when clearing a non 
mandatory selector

This changeset [1] fixed a problem where a callout was being called twice when 
picking a value from a selector. The first request was done properly, but the
second one was done with a null value. The fix consisted in not notifying a 
change in selector when it was modified from a non-empty value to an empty 
value.

But as a result, when a non mandatory selector is emptied, callouts are no 
longer being invoked. The original issue is very hard to reproduce, I have not 
been
able to find a new way to reproduce it or fix it. To avoid the regression, now 
the code that was done to fix [1] will only take place if the selector is 
mandatory,
to make sure that it is possible to give empty values to non-mandatory 
selectors.

[1] 
https://code.openbravo.com/erp/devel/pi/rev/baf72de5b678a308c36d5946af3e143d08625eca

details:   https://code.openbravo.com/erp/devel/main/rev/6f6bd229fc5e
changeset: 33193:6f6bd229fc5e
user:      Javier Armendáriz <javier.armendariz <at> openbravo.com>
date:      Wed Feb 14 18:34:52 2018 +0100
summary:   Fixed bug 37918: Internal CSS are included in AD_TextInterfaces

Adding <style> tags along <script> as tags excluded from being parsed for the 
Translate class.

details:   https://code.openbravo.com/erp/devel/main/rev/3d0a6e6d22a6
changeset: 33194:3d0a6e6d22a6
user:      Javier Armendáriz <javier.armendariz <at> openbravo.com>
date:      Thu Feb 15 08:59:30 2018 +0100
summary:   Fixed issue 37814: Support custom error pages

details:   https://code.openbravo.com/erp/devel/main/rev/004f062b4d0c
changeset: 33195:004f062b4d0c
user:      Javier Armendáriz <javier.armendariz <at> openbravo.com>
date:      Thu Feb 15 09:22:54 2018 +0100
summary:   Related to 37814: Backing out changes

details:   https://code.openbravo.com/erp/devel/main/rev/73d6257cabce
changeset: 33196:73d6257cabce
user:      Javier Armendáriz <javier.armendariz <at> openbravo.com>
date:      Thu Feb 15 09:25:57 2018 +0100
summary:   Related to 37814: Backing out changes. Removing missing file

details:   https://code.openbravo.com/erp/devel/main/rev/3420f8221073
changeset: 33197:3420f8221073
user:      Carlos Aristu <carlos.aristu <at> openbravo.com>
date:      Thu Feb 15 09:34:49 2018 +0100
summary:   related to issue 37918: updated copyright year

details:   https://code.openbravo.com/erp/devel/main/rev/82be2c7d9d11
changeset: 33198:82be2c7d9d11
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Thu Feb 15 12:47:06 2018 +0000
summary:   Update AD_MODULE version to 3.0PR17Q4.1

details:   https://code.openbravo.com/erp/devel/main/rev/2ed90e80323f
changeset: 33199:2ed90e80323f
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Thu Feb 15 12:47:07 2018 +0000
summary:   Added tag 3.0PR17Q4.1 for changeset 82be2c7d9d11

details:   https://code.openbravo.com/erp/devel/main/rev/4c5d205b6e8c
changeset: 33200:4c5d205b6e8c
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Thu Feb 15 12:47:07 2018 +0000
summary:   Added signature for changeset 2ed90e80323f

details:   https://code.openbravo.com/erp/devel/main/rev/688fcca7af57
changeset: 33201:688fcca7af57
user:      RM packaging bot <staff.rm <at> openbravo.com>
date:      Tue Feb 20 05:47:07 2018 +0000
summary:   Merge temporary head for 3.0PR17Q4.1

diffstat:

 .hgsigs                                                                        
                                                                                
      |      6 +
 .hgtags                                                                        
                                                                                
      |      6 +
 README                                                                         
                                                                                
      |      1 +
 build.xml                                                                      
                                                                                
      |     47 +
 legal/Licensing.txt                                                            
                                                                                
      |      8 +-
 lib/README                                                                     
                                                                                
      |      1 +
 lib/runtime/hibernate3-patched.jar                                             
                                                                                
      |    Bin 
 lib/runtime/javassist-3.14.0-GA.jar                                            
                                                                                
      |    Bin 
 lib/runtime/javassist-3.20.0-GA.jar                                            
                                                                                
      |    Bin 
 lib/runtime/jettison-1.3-patched.jar                                           
                                                                                
      |    Bin 
 lib/runtime/jettison-1.3.jar                                                   
                                                                                
      |    Bin 
 lib/runtime/renderFoRmi.jar                                                    
                                                                                
      |    Bin 
 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/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
                                                     |     36 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java
                                            |     21 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
                                                 |      7 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java
                                                           |     23 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
                                                                     |     75 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
                                                                       |     31 
+-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java
                                                         |     25 +-
 
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
                                                                              | 
     4 +-
 
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                   |      2 +-
 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml       
                                                                                
      |      4 +-
 
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                                
  |      2 +-
 
modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_UIPERS_MOD_TRG.xml
                                                                   |      3 -
 
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
                                                                                
   |     14 +-
 
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-test/org/openbravo/client/application/test/DynamicExpressionParserTest.java
                                             |     78 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java
                                                          |    171 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
                                                           |     19 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
                                                                       |      6 
+-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java
                                                      |      6 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java
                                                  |      8 +
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java
                                                    |     10 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java
                                                             |     12 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
                                                        |     13 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
                                                   |     39 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
                                        |     55 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
                                                  |     77 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
                                          |     14 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js
                                                   |     31 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js
                                                                |      7 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js
                                                           |     15 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
                                                                |     12 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
                                                            |     10 +
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
                                                          |     21 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
                                                                      |     19 
+-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-base-parameter-window-view.js
                                            |     52 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js
                                                         |      7 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
                                                               |      8 +-
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js
                                                |      5 +-
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.css
     |     13 +-
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.js
      |      3 +-
 
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js
 |      3 +-
 
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.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/org/openbravo/client/kernel/I18NComponent.java
                                                                               
|     27 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
                                                                     |      6 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
                                                                  |      2 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/LinkUIDefinition.java
                                                                  |      2 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/RichTextUIDefinition.java
                                                              |      5 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java
                                                                |      2 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
                                                                      |     24 
+-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl
                                                                               
|     76 +-
 
modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/ob-i18n.js
                                                                                
    |    100 +
 
modules/org.openbravo.client.myob/src-db/database/model/triggers/OBKMO_WIDGET_REFERENCE_MOD_TRG.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.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.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.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.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.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/org/openbravo/service/datasource/ADTreeDatasourceService.java
                                                           |    142 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
                                                                 |      7 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java
                                                             |      3 +-
 
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.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.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
                                                                          |     
29 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java
                                                                           |    
  4 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
                                                                        |     
12 -
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java
                                                                           |    
  6 +-
 
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/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
                                             |      2 +-
 
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/js/ob-smartclient.js
                                                     |      7 +-
 
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
                                                                                
   |      4 +-
 
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
                                                                        |      
2 +-
 modules/org.openbravo.v3.datasets/referencedata/standard/V3_Roles.xml          
                                                                                
      |    786 +-
 modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml    
                                                                                
      |      2 +-
 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/sourcedata/AD_MODULE.xml              
                                                                                
      |      4 +-
 modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml   
                                                                                
      |     22 +-
 referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml         
                                                                                
      |    196 -
 referencedata/sampledata/F_B_International_Group/AD_PROCESS_REQUEST.xml        
                                                                                
      |   1282 +-
 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          
                                                                                
      |    140 +
 referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml            
                                                                                
      |     22 +-
 referencedata/sampledata/F_B_International_Group/A_ASSET.xml                   
                                                                                
      |     20 +-
 referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml                
                                                                                
      |     74 +-
 referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml         
                                                                                
      |     36 +
 referencedata/sampledata/F_B_International_Group/C_INVOICE.xml                 
                                                                                
      |   3856 +-
 referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml             
                                                                                
      |   8902 +
 referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml          
                                                                                
      |   4356 +
 referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml              
                                                                                
      |   1020 +
 referencedata/sampledata/F_B_International_Group/C_ORDER.xml                   
                                                                                
      |   2286 +
 referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml               
                                                                                
      |  10221 ++
 referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml            
                                                                                
      |   3706 +
 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/FACT_ACCT.xml                 
                                                                                
      |  47075 +++++++++-
 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    
                                                                                
      |   1794 +
 referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml     
                                                                                
      |      8 +-
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml               
                                                                                
      |   2046 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml        
                                                                                
      |    928 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml      
                                                                                
      |    174 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml   
                                                                                
      |    600 +
 referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml      
                                                                                
      |   2330 +-
 
referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml 
                                                                                
     |   1312 +-
 referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml        
                                                                                
      |     58 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml                
                                                                                
      |    108 +
 referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml           
                                                                                
      |     82 +-
 referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml            
                                                                                
      |   1260 +
 referencedata/sampledata/F_B_International_Group/M_ATTRIBUTESETINSTANCE.xml    
                                                                                
      |     90 +
 referencedata/sampledata/F_B_International_Group/M_COSTING.xml                 
                                                                                
      |   2054 +-
 referencedata/sampledata/F_B_International_Group/M_INOUT.xml                   
                                                                                
      |   1566 +
 referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml               
                                                                                
      |   4738 +
 referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml                
                                                                                
      |   1482 +
 referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml                 
                                                                                
      |   2964 +
 referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml          
                                                                                
      |    233 +-
 referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml         
                                                                                
      |     52 +-
 referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml             
                                                                                
      |   6180 +
 referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml        
                                                                                
      |   3502 +
 referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml    
                                                                                
      |    140 +
 referencedata/sampledata/QA_Testing/AD_CLIENT.xml                              
                                                                                
      |      1 +
 referencedata/sampledata/QA_Testing/AD_PINSTANCE.xml                           
                                                                                
      |    220 +
 referencedata/sampledata/QA_Testing/AD_PINSTANCE_PARA.xml                      
                                                                                
      |     34 +
 referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml                      
                                                                                
      |    182 +-
 referencedata/sampledata/QA_Testing/AD_PROCESS_REQUEST.xml                     
                                                                                
      |     18 +
 referencedata/sampledata/QA_Testing/AD_ROLE.xml                                
                                                                                
      |     12 +-
 referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml                            
                                                                                
      |     20 +
 referencedata/sampledata/QA_Testing/AD_USER.xml                                
                                                                                
      |     28 +
 referencedata/sampledata/QA_Testing/AD_WINDOW_ACCESS.xml                       
                                                                                
      |    420 +
 referencedata/sampledata/QA_Testing/C_BPARTNER.xml                             
                                                                                
      |     84 +-
 referencedata/sampledata/QA_Testing/C_ORDER.xml                                
                                                                                
      |     30 +-
 referencedata/sampledata/QA_Testing/C_PERIOD.xml                               
                                                                                
      |    216 +
 referencedata/sampledata/QA_Testing/C_PERIODCONTROL.xml                        
                                                                                
      |  16128 +++
 referencedata/sampledata/QA_Testing/C_PERIODCONTROL_LOG.xml                    
                                                                                
      |    228 +
 referencedata/sampledata/QA_Testing/C_POC_DOCTYPE_TEMPLATE.xml                 
                                                                                
      |     22 +
 referencedata/sampledata/QA_Testing/C_YEAR.xml                                 
                                                                                
      |     16 +
 referencedata/sampledata/QA_Testing/FACT_ACCT.xml                              
                                                                                
      |      6 -
 referencedata/sampledata/QA_Testing/FIN_PAYMENT.xml                            
                                                                                
      |      2 +-
 referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULE.xml                   
                                                                                
      |      1 -
 referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULEDETAIL.xml             
                                                                                
      |      2 +
 referencedata/sampledata/QA_Testing/M_INOUT.xml                                
                                                                                
      |    200 +-
 referencedata/sampledata/QA_Testing/M_INVENTORY.xml                            
                                                                                
      |    204 +-
 referencedata/sampledata/QA_Testing/M_MATCHINV.xml                             
                                                                                
      |    202 +-
 referencedata/sampledata/QA_Testing/M_MOVEMENT.xml                             
                                                                                
      |     12 +-
 referencedata/sampledata/QA_Testing/M_PRODUCT.xml                              
                                                                                
      |    106 +-
 referencedata/sampledata/QA_Testing/M_STORAGE_DETAIL.xml                       
                                                                                
      |      2 +-
 referencedata/sampledata/QA_Testing/OBKMO_WIDGET_CLASS_ACCESS.xml              
                                                                                
      |     39 +
 referencedata/sampledata/QA_Testing/OBUIAPP_GC_FIELD.xml                       
                                                                                
      |     21 -
 referencedata/sampledata/QA_Testing/OBUIAPP_GC_TAB.xml                         
                                                                                
      |     21 -
 referencedata/sampledata/QA_Testing/OBUIAPP_PROCESS_ACCESS.xml                 
                                                                                
      |    756 +
 src-core/.classpath                                                            
                                                                                
      |      1 -
 src-core/build.xml                                                             
                                                                                
      |      2 +-
 src-core/src/org/openbravo/base/ConfigParameters.java                          
                                                                                
      |      2 -
 src-core/src/org/openbravo/base/HttpBaseServlet.java                           
                                                                                
      |     94 +-
 src-core/src/org/openbravo/base/MultipartRequest.java                          
                                                                                
      |      4 +-
 src-core/src/org/openbravo/database/ConnectionProviderImpl.java                
                                                                                
      |      6 +-
 src-core/utils/rmi/Readme.txt                                                  
                                                                                
      |     66 -
 src-core/utils/rmi/java.policy                                                 
                                                                                
      |      3 -
 src-core/utils/rmi/src/rmi/RenderFo.java                                       
                                                                                
      |    102 -
 src-core/utils/rmi/src/rmi/RenderFoI.java                                      
                                                                                
      |     23 -
 src-db/database/build-create.xml                                               
                                                                                
      |      7 +-
 src-db/database/build.xml                                                      
                                                                                
      |      4 +-
 src-db/database/lib/dbsourcemanager.jar                                        
                                                                                
      |    Bin 
 src-db/database/model/excludeFilter.xml                                        
                                                                                
      |      1 +
 src-db/database/model/functions/AD_COLUMN_IDENTIFIER_REF_SQL.xml               
                                                                                
      |      3 -
 src-db/database/model/functions/AD_TABLE_IMPORT.xml                            
                                                                                
      |      4 -
 src-db/database/model/functions/AD_TAB_IMPORT.xml                              
                                                                                
      |      4 -
 src-db/database/model/functions/AD_UPDATE_TABLE_IDENTIFIER.xml                 
                                                                                
      |     23 -
 src-db/database/model/functions/MA_PRODUCTION_COST.xml                         
                                                                                
      |     33 +-
 src-db/database/model/functions/M_PROMOTION_CALCULATE.xml                      
                                                                                
      |     20 +-
 src-db/database/model/functions/M_REQUISITION_CREATEPO.xml                     
                                                                                
      |      4 +-
 src-db/database/model/postscript-PostgreSql.sql                                
                                                                                
      |      6 -
 src-db/database/model/prescript-PostgreSql.sql                                 
                                                                                
      |     10 -
 src-db/database/model/prescript-systemuser-PostgreSql.sql                      
                                                                                
      |     18 +
 src-db/database/model/tables/AD_ALERT.xml                                      
                                                                                
      |      2 +-
 src-db/database/model/tables/M_MATCHPO.xml                                     
                                                                                
      |      1 -
 src-db/database/model/triggers/AD_AUXILIARINPUT_MOD_TRG.xml                    
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_CALLOUT_MOD_TRG.xml                          
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml                           
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_DATASET_MOD_TRG.xml                          
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_ELEMENT_MOD_TRG.xml                          
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_FIELDGROUP_MOD_TRG.xml                       
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_FIELD_MOD_TRG.xml                            
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_FORM_MOD_TRG.xml                             
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_MENU_MOD_TRG.xml                             
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_MESSAGE_MOD_TRG.xml                          
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_MODULE_DBPREFIX_MOD_TRG.xml                  
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml                      
                                                                                
      |      2 -
 src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml                
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_PACKAGE_MOD_TRG.xml                          
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_PREFERENCE_MOD_TRG.xml                       
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_PROCESS_GROUP_LIST_MOD_TRG.xml               
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_PROCESS_GROUP_MOD_TRG.xml                    
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_PROCESS_MOD_TRG.xml                          
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml                        
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_REF_SEARCH_COLUMN_MOD_TRG.xml                
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_REF_SEARCH_MOD_TRG.xml                       
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_REF_TABLE_MOD_TRG.xml                        
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_TABLE_MOD_TRG.xml                            
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_TABLE_NAVIGATION_MOD_TRG.xml                 
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_TAB_MOD_TRG.xml                              
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_TEXTINTERFACES_MOD_TRG.xml                   
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_VAL_RULE_MOD_TRG.xml                         
                                                                                
      |      3 -
 src-db/database/model/triggers/AD_WINDOW_MOD_TRG.xml                           
                                                                                
      |      3 -
 src-db/database/sourcedata/AD_CALLOUT.xml                                      
                                                                                
      |     10 +
 src-db/database/sourcedata/AD_COLUMN.xml                                       
                                                                                
      |     24 +-
 src-db/database/sourcedata/AD_ELEMENT.xml                                      
                                                                                
      |      9 +-
 src-db/database/sourcedata/AD_FIELD.xml                                        
                                                                                
      |    290 +-
 src-db/database/sourcedata/AD_MESSAGE.xml                                      
                                                                                
      |     74 +-
 src-db/database/sourcedata/AD_MODEL_OBJECT.xml                                 
                                                                                
      |     24 +-
 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml                         
                                                                                
      |     10 -
 src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml                            
                                                                                
      |     10 -
 src-db/database/sourcedata/AD_MODULE.xml                                       
                                                                                
      |      4 +-
 src-db/database/sourcedata/AD_PREFERENCE.xml                                   
                                                                                
      |     22 +
 src-db/database/sourcedata/AD_PROCESS.xml                                      
                                                                                
      |     24 -
 src-db/database/sourcedata/AD_REFERENCE.xml                                    
                                                                                
      |     14 +
 src-db/database/sourcedata/AD_TAB.xml                                          
                                                                                
      |     30 +
 src-db/database/sourcedata/AD_TEXTINTERFACES.xml                               
                                                                                
      |     44 +-
 src-db/database/sourcedata/AD_WINDOW.xml                                       
                                                                                
      |     19 +-
 src-db/database/sourcedata/OBUIAPP_PARAMETER.xml                               
                                                                                
      |     52 +
 src-db/database/sourcedata/OBUIAPP_PROCESS.xml                                 
                                                                                
      |     20 +
 src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml                              
                                                                                
      |      9 +
 src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml                          
                                                                                
      |      2 +-
 src-test/src/org/openbravo/test/AllAntTaskTests.java                           
                                                                                
      |     12 +-
 src-test/src/org/openbravo/test/AllWebserviceTests.java                        
                                                                                
      |      4 +-
 
src-test/src/org/openbravo/test/copyLinesFromOrders/CopyLinesFromOrdersTest.java
                                                                                
     |    561 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/BPartnerDataConstants.java
                                                                                
  |     47 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestConstants.java 
                                                                                
     |    129 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_13.java 
                                                                                
     |    121 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_14.java 
                                                                                
     |    124 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_15.java 
                                                                                
     |    123 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_16.java 
                                                                                
     |    129 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_17.java 
                                                                                
     |    129 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_18.java 
                                                                                
     |    374 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_19.java 
                                                                                
     |    123 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPO_20.java 
                                                                                
     |    122 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataPerformance.java
                                                                                
|     60 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_01.java 
                                                                                
     |    126 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_02.java 
                                                                                
     |    129 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_03.java 
                                                                                
     |    124 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_04.java 
                                                                                
     |    131 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_05.java 
                                                                                
     |    131 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_06.java 
                                                                                
     |    347 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_07.java 
                                                                                
     |    163 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_08.java 
                                                                                
     |    163 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_AUM_21.java
                                                                                
  |    137 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CLFOTestDataSO_AUM_22.java
                                                                                
  |    137 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/CopyLinesFromOrdersTestData.java
                                                                            |   
 254 +
 src-test/src/org/openbravo/test/copyLinesFromOrders/data/JSONUtils.java        
                                                                                
      |     59 +
 src-test/src/org/openbravo/test/copyLinesFromOrders/data/OrderData.java        
                                                                                
      |    145 +
 src-test/src/org/openbravo/test/copyLinesFromOrders/data/OrderLineData.java    
                                                                                
      |    184 +
 
src-test/src/org/openbravo/test/copyLinesFromOrders/data/UOMManagementUtil.java 
                                                                                
     |    130 +
 src-test/src/org/openbravo/test/costing/TestCosting.java                       
                                                                                
      |    421 +-
 src-test/src/org/openbravo/test/costing/TestCostingUtils.java                  
                                                                                
      |     90 +
 src-test/src/org/openbravo/test/dal/DalStoredProcedureTest.java                
                                                                                
      |      4 +-
 src-test/src/org/openbravo/test/dal/IssuesTest.java                            
                                                                                
      |     27 +-
 src-test/src/org/openbravo/test/dal/ValidationTest.java                        
                                                                                
      |      4 +-
 src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java       
                                                                                
      |      6 +-
 src-test/src/org/openbravo/test/preference/PreferenceTest.java                 
                                                                                
      |     72 +-
 src-test/src/org/openbravo/test/reporting/AllJrxmlCompilation.java             
                                                                                
      |     92 +
 src-test/src/org/openbravo/test/role/inheritance/AccessPropagation.java        
                                                                                
      |      2 +-
 
src-test/src/org/openbravo/test/role/inheritance/AccessPropagationNotInherited.java
                                                                                
  |      2 +-
 src-test/src/org/openbravo/test/role/inheritance/DeletedAccessPropagation.java 
                                                                                
      |      6 +-
 src-test/src/org/openbravo/test/role/inheritance/HorizontalInheritance.java    
                                                                                
      |      6 +-
 src-test/src/org/openbravo/test/role/inheritance/RecalculatePermissions.java   
                                                                                
      |      6 +-
 
src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceRestrictions.java
                                                                                
    |     34 +-
 src-test/src/org/openbravo/test/role/inheritance/VerticalInheritance.java      
                                                                                
      |      4 +-
 src-test/src/org/openbravo/test/scheduling/ProcessSchedulingTest.java          
                                                                                
      |     61 +-
 src-test/src/org/openbravo/test/security/UserInfoSessionDataTest.java          
                                                                                
      |    254 +
 src-test/src/org/openbravo/test/xml/EntityXMLImportTestBusinessObject.java     
                                                                                
      |     10 +-
 src-wad/src/org/openbravo/wad/WadConnection.java                               
                                                                                
      |      6 +-
 src/build.xml                                                                  
                                                                                
      |      4 +-
 src/org/openbravo/base/ServerVersionChecker.java                               
                                                                                
      |      2 +-
 src/org/openbravo/base/model/Column.java                                       
                                                                                
      |      2 +-
 src/org/openbravo/base/model/Property.java                                     
                                                                                
      |      2 +-
 src/org/openbravo/base/model/domaintype/BooleanDomainType.java                 
                                                                                
      |      2 +-
 src/org/openbravo/base/model/domaintype/ButtonDomainType.java                  
                                                                                
      |      2 +-
 src/org/openbravo/base/model/domaintype/LongDomainType.java                    
                                                                                
      |      2 +-
 src/org/openbravo/base/secureApp/LoginUtils.java                               
                                                                                
      |     21 +-
 src/org/openbravo/common/actionhandler/CopyFromOrdersActionHandler.java        
                                                                                
      |    122 +
 src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java     
                                                                                
      |      6 +
 src/org/openbravo/common/actionhandler/SRMOPickEditLines.java                  
                                                                                
      |      7 +-
 
src/org/openbravo/common/actionhandler/copyfromorderprocess/CopyFromOrdersProcess.java
                                                                               
|    271 +
 
src/org/openbravo/common/actionhandler/copyfromorderprocess/CopyFromOrdersProcessFilterExpression.java
                                                               |     71 +
 
src/org/openbravo/common/actionhandler/copyfromorderprocess/CopyFromOrdersProcessImplementationInterface.java
                                                        |     74 +
 
src/org/openbravo/common/actionhandler/copyfromorderprocess/UpdateOrderLineInformation.java
                                                                          |    
149 +
 
src/org/openbravo/common/actionhandler/copyfromorderprocess/UpdatePricesAndAmounts.java
                                                                              | 
   270 +
 
src/org/openbravo/common/actionhandler/copyfromorderprocess/UpdateProductAndAttributes.java
                                                                          |    
126 +
 
src/org/openbravo/common/actionhandler/copyfromorderprocess/UpdateQuantitiesAndUOMs.java
                                                                             |  
   96 +
 src/org/openbravo/common/actionhandler/copyfromorderprocess/UpdateTax.java     
                                                                                
      |    122 +
 src/org/openbravo/costing/CostingAlgorithm.java                                
                                                                                
      |     47 +-
 src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java                   
                                                                                
      |      2 +-
 src/org/openbravo/costing/PriceDifferenceBackground.java                       
                                                                                
      |     12 +-
 src/org/openbravo/costing/PriceDifferenceByDateProcess.java                    
                                                                                
      |     73 +-
 src/org/openbravo/costing/PriceDifferenceProcess.java                          
                                                                                
      |    163 +-
 src/org/openbravo/costing/PriceDifferenceUtil.java                             
                                                                                
      |     91 +
 src/org/openbravo/dal/core/OBInterceptor.java                                  
                                                                                
      |      2 +-
 src/org/openbravo/dal/core/SessionHandler.java                                 
                                                                                
      |      2 +-
 src/org/openbravo/dal/security/EntityAccessChecker.java                        
                                                                                
      |      2 +-
 src/org/openbravo/dal/xml/XMLTypeConverter.java                                
                                                                                
      |      8 +-
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.html               
                                                                                
      |    254 -
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.java               
                                                                                
      |    344 -
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.xml                
                                                                                
      |     37 -
 src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder_data.xsql          
                                                                                
      |    228 -
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java                    
                                                                                
      |      9 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.html            
                                                                                
      |      7 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters.java            
                                                                                
      |      6 +-
 src/org/openbravo/erpCommon/ad_actionButton/ExportReferenceData.html           
                                                                                
      |     49 +-
 src/org/openbravo/erpCommon/ad_actionButton/InsertAcces.html                   
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_actionButton/TaxRegister.xsql                   
                                                                                
      |     10 +-
 src/org/openbravo/erpCommon/ad_callouts/ISO_4217.xml                           
                                                                                
      |   1942 +
 src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java               
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/ad_callouts/SE_Locator_Activate.java               
                                                                                
      |      8 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_Currency_StdPrecision.java          
                                                                                
      |     63 +
 src/org/openbravo/erpCommon/ad_forms/About.html                                
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java              
                                                                                
      |     11 +-
 src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java                 
                                                                                
      |     28 +-
 src/org/openbravo/erpCommon/ad_forms/DocInvoice.java                           
                                                                                
      |      3 +-
 src/org/openbravo/erpCommon/ad_forms/DocLineInvoice_data.xsql                  
                                                                                
      |      2 +
 src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html                   
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html      
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html     
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html         
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java                     
                                                                                
      |      6 +-
 src/org/openbravo/erpCommon/ad_forms/ModuleManagementDetails.html              
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html              
                                                                                
      |      2 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagementSettings.html             
                                                                                
      |      3 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagementSettings.xml              
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallLocal.html        
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html           
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP2.html           
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/ModuleManagement_UpgradeInfo.html         
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/SQLExecutor.html                          
                                                                                
      |      4 -
 src/org/openbravo/erpCommon/ad_forms/SQLExecutor.java                          
                                                                                
      |    132 +-
 src/org/openbravo/erpCommon/ad_forms/SQLExecutor.xml                           
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/SQLExecutor_Query.java                    
                                                                                
      |     97 +-
 src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html               
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/ShowSessionVariables.html                 
                                                                                
      |      3 -
 src/org/openbravo/erpCommon/ad_forms/Translation.html                          
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_forms/TranslationManager.java                   
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.html                  
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_process/AlertProcess.java                       
                                                                                
      |     31 +-
 src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java            
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/ad_process/DeleteClient.html                       
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java                   
                                                                                
      |      5 +-
 src/org/openbravo/erpCommon/ad_process/UpdateActuals.java                      
                                                                                
      |     51 +-
 src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports.java                 
                                                                                
      |     11 +-
 src/org/openbravo/erpCommon/ad_reports/MInOutTraceReports_data.xsql            
                                                                                
      |      3 -
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java         
                                                                                
      |    492 +-
 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql    
                                                                                
      |     53 +
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql
                                                                          |    
134 +-
 src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html           
                                                                                
      |      1 -
 src/org/openbravo/erpCommon/ad_reports/ReportTrialBalancePDF.jrxml             
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java               
                                                                                
      |     15 +-
 src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql          
                                                                                
      |     64 +-
 src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java         
                                                                                
      |     22 +-
 src/org/openbravo/erpCommon/businessUtility/Preferences.java                   
                                                                                
      |     80 +-
 src/org/openbravo/erpCommon/businessUtility/WindowTabs.java                    
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/info/ImageInfo.html                                
                                                                                
      |      3 -
 src/org/openbravo/erpCommon/info/ImageInfoBLOB.html                            
                                                                                
      |    252 -
 src/org/openbravo/erpCommon/info/ImageInfoBLOB.java                            
                                                                                
      |    346 +-
 src/org/openbravo/erpCommon/info/ImageInfoBLOB.xml                             
                                                                                
      |     34 -
 src/org/openbravo/erpCommon/modules/ApplyModule.java                           
                                                                                
      |    106 +-
 src/org/openbravo/erpCommon/modules/ImportModule.java                          
                                                                                
      |      6 +-
 src/org/openbravo/erpCommon/modules/ModuleReferenceDataClientTree.java         
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java            
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/modules/ModuleTree.java                            
                                                                                
      |      4 +-
 src/org/openbravo/erpCommon/obps/ActivationKey.java                            
                                                                                
      |     13 +-
 src/org/openbravo/erpCommon/obps/CheckCleanCache.java                          
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/security/Login.html                                
                                                                                
      |      6 +-
 src/org/openbravo/erpCommon/security/SessionLogin.java                         
                                                                                
      |      6 +-
 src/org/openbravo/erpCommon/utility/GenericTree.java                           
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/utility/GenericTreeServlet.java                    
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/utility/ISOCurrencyPrecision.java                  
                                                                                
      |    140 +
 src/org/openbravo/erpCommon/utility/InventoryStatusUtils.java                  
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/utility/JRFieldProviderDataSource.java             
                                                                                
      |      8 +-
 src/org/openbravo/erpCommon/utility/OBMessageUtils.java                        
                                                                                
      |     19 +-
 src/org/openbravo/erpCommon/utility/OpenPentaho.java                           
                                                                                
      |      2 +-
 src/org/openbravo/erpCommon/utility/SetPriority.html                           
                                                                                
      |      3 -
 src/org/openbravo/erpCommon/utility/StringCollectionUtils.java                 
                                                                                
      |     75 +
 src/org/openbravo/erpCommon/utility/SystemInfo.java                            
                                                                                
      |     10 +-
 src/org/openbravo/erpCommon/utility/UsedByLink.java                            
                                                                                
      |     95 +-
 src/org/openbravo/erpCommon/utility/Utility.java                               
                                                                                
      |     52 +-
 src/org/openbravo/erpCommon/utility/WindowTree.java                            
                                                                                
      |      6 +-
 src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java    
                                                                                
      |     10 +-
 src/org/openbravo/erpReports/RptC_Bpartner.html                                
                                                                                
      |      7 +-
 src/org/openbravo/event/InvoiceLineEventHandler.java                           
                                                                                
      |     16 +-
 src/org/openbravo/materialmgmt/ReservationUtils.java                           
                                                                                
      |      4 +-
 src/org/openbravo/materialmgmt/ResetValuedStockAggregated.java                 
                                                                                
      |     17 +-
 src/org/openbravo/reference/ui/UIReferenceUtility.java                         
                                                                                
      |      6 +-
 src/org/openbravo/scheduling/DefaultJob.java                                   
                                                                                
      |      4 +-
 src/org/openbravo/scheduling/ProcessMonitor.java                               
                                                                                
      |      5 +-
 src/org/openbravo/service/db/DalBaseProcess.java                               
                                                                                
      |     13 +-
 src/org/openbravo/service/importprocess/ImportEntryProcessor.java              
                                                                                
      |     30 +-
 src/org/openbravo/service/importprocess/ImportProcessUtils.java                
                                                                                
      |      4 +-
 432 files changed, 148637 insertions(+), 6187 deletions(-)

diffs (truncated from 207389 to 300 lines):

diff -r a8b6912d30a3 -r 688fcca7af57 .hgsigs
--- a/.hgsigs   Thu Dec 28 08:02:43 2017 +0000
+++ b/.hgsigs   Tue Feb 20 05:47:07 2018 +0000
@@ -218,4 +218,10 @@
 0e959ce9b986f2770ac4ac02296a59adaafdc919 0 
iEYEABECAAYFAllSJLwACgkQCX/oGf+2qkOkKACfWiWW37hMTW9d4fneU+4JJsG//LYAoLkOPDVyEZCTY/IpOEuXT0hHKE9e
 4bad64e9d7577310506e2e19cacba696ed703ad6 0 
iEYEABECAAYFAlmKpMUACgkQCX/oGf+2qkNGywCgobMSxQWqAp5l5HsKqlQMPn8GkNsAoOBNizvazzb9wRiYA1/57ntgR253
 9e6056c0e38e4355acf8d72a8efab6575c7f9733 0 
iEYEABECAAYFAlm40qMACgkQCX/oGf+2qkPKxgCgndqN2CnOSnbnZEsQntY+mUaqZZEAoK6Xl9Q4HbgHep6JG/owLOzyehRK
+391e9626024899e664de6a55c88ee72e3e2d9710 0 
iEYEABECAAYFAln77A4ACgkQCX/oGf+2qkOfGACgyr/EcAt6vsNW/zbB1YQ01t3UVtEAoNJJf5xPqkNN1SbNHwLySptoRaDN
 ff7be0e0ba8762069ad86523828a57139b396d39 0 
iEYEABECAAYFAlm/UPkACgkQCX/oGf+2qkM8UQCdGDxGviT6mh8nKnu2HP1qzZzX0cYAoJaBd9WSUNj2Dlh2yjJT+7zYxKcC
+54cdd8284122f787eac4b4ab67b4ab4584ddcccb 0 
iEYEABECAAYFAln8YP0ACgkQCX/oGf+2qkNbKACgxFsQqRE0goPX4VewSccTQcGZRVEAnitoyHAuUroUJpFUFLztc6pzkUL2
+bbeae307872835b1e84136c537adec44b7a0b3c1 0 
iEYEABECAAYFAlpDLAIACgkQCX/oGf+2qkNiugCgj1TTu2BeYoAqAqD08Gci3lHJvogAnAvmNL987nIAckknQ1CosIUDmA+K
+2e43174aba46ec6956a0e703bbb9bee5292c871a 0 
iEYEABECAAYFAlpuyUwACgkQCX/oGf+2qkPuJgCePIRg5ennwj6kgpOnyxZCPUV54Y0Ani30NnQNuNkXNkBMyykw2JfW21Vs
+43d95f7cb67084eb978752359847ab28b9aa14f6 0 
iEYEABECAAYFAlpEpSMACgkQCX/oGf+2qkNdMACdGNGo6rpHht3lNH3FmwtsNcIe65sAn1sM9rBx/Sm3ytwcL2C5irUyD05J
+2ed90e80323f7bf5245be3946e2f60ea68d30f6e 0 
iEYEABECAAYFAlqFgUsACgkQCX/oGf+2qkMGWwCg9AesP/a8fHuHrGVkUZcGk0x8CSgAniD73vR4fZ3uaU1eqtQr9HYlwpCQ
diff -r a8b6912d30a3 -r 688fcca7af57 .hgtags
--- a/.hgtags   Thu Dec 28 08:02:43 2017 +0000
+++ b/.hgtags   Tue Feb 20 05:47:07 2018 +0000
@@ -229,4 +229,10 @@
 c37991aee21566d0ed397369377abdaeaf1a6f52 3.0PR17Q2.1
 632ba9b2ee8c8133be5b483482d3d99a83b4138f 3.0PR17Q2.2
 7fafd2a9f24bd0d5889253005412101631cc1efe 3.0PR17Q2.3
+688697b19d3692d75972558eaf9fc5eccd145a61 3.0PR17Q2.4
 a8925ad2d61f4625aa62c1ee31babecaa73b787f 3.0PR17Q3
+452e6c576f1db52e686cf3138099790e242e7927 3.0PR17Q3.1
+f500d43a59bb69265a7aa704a9fd20bffd68c8a9 3.0PR17Q3.2
+dd65065492e55421c107be4c87894a508bb1244d 3.0PR17Q3.3
+a8b6912d30a34e4a7d0873fc0fe53df228417b49 3.0PR17Q4
+82be2c7d9d11d77238355e65724408b6c5aa2ffb 3.0PR17Q4.1
diff -r a8b6912d30a3 -r 688fcca7af57 README
--- a/README    Thu Dec 28 08:02:43 2017 +0000
+++ b/README    Tue Feb 20 05:47:07 2018 +0000
@@ -36,3 +36,4 @@
 * Contact
 
 IRC: #openbravo in freenode
+
diff -r a8b6912d30a3 -r 688fcca7af57 build.xml
--- a/build.xml Thu Dec 28 08:02:43 2017 +0000
+++ b/build.xml Tue Feb 20 05:47:07 2018 +0000
@@ -98,6 +98,19 @@
  
   <available file=".hg" property="is.hg" />
 
+  <condition property="jdk9">
+    <not>
+      <or>
+        <equals arg1="${ant.java.version}" arg2="1.7"/>
+        <equals arg1="${ant.java.version}" arg2="1.8"/>
+      </or>
+    </not>
+  </condition>
+
+  <condition property="j9.module.args" value="--add-modules=java.se.ee" 
else="">
+    <isset property="jdk9"/>
+  </condition>
+
   <condition property="calculate.core.rev">
    <istrue value="${calculate.core.revision}"/>
   </condition>
@@ -522,6 +535,11 @@
   </target>
 
   <target name="generate.java.doc">
+    <antcall target="generate.java.doc.jdk7"/>
+    <antcall target="generate.java.doc.jdk9"/>
+  </target>
+
+  <target name="generate.java.doc.jdk7" unless="jdk9">
     <javadoc Windowtitle="${title}" access="protected" Header="${header}" 
Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes">
       <sourcepath>
         <pathelement path="${base.src}" />
@@ -548,6 +566,35 @@
     </javadoc>
   </target>
 
+  <target name="generate.java.doc.jdk9" if="jdk9">
+    <javadoc Windowtitle="${title}" access="protected" Header="${header}" 
Footer="${footer}" destdir="${build.docs}" maxmemory="1024M" failonerror="yes">
+      <sourcepath>
+        <pathelement path="${base.src}" />
+        <pathelement path="${base.src.test}/src" />
+        <pathelement path="${build.AD}" />
+        <pathelement path="${base.src.core}/src" />
+        <pathelement path="${base.src.gen}" />
+        <pathelement path="build/javasqlc/src" />
+        <pathelement path="build/javasqlc/srcAD" />
+        <dirset dir="${base.modules}">
+          <include name="*/src" />
+          <include name="*/src-test" />
+        </dirset>
+      </sourcepath>
+      <excludepackage name="org.openbravo.erpWindows.*"/>
+      <classpath>
+        <path refid="project.class.path"/>
+        <pathelement path="lib/build/js.jar" />
+        <fileset dir="${base.modules}">
+          <include name="*/lib/test/*.jar" />
+        </fileset>
+      </classpath>
+      <link href="http://docs.oracle.com/javase/9/docs/api/"/>
+      <arg value="${j9.module.args}"/>
+      <arg value="-Xdoclint:none"/>
+    </javadoc>
+  </target>
+
   <target name="generate.entities">
     <ant dir="${base.src}" target="generate.entities" inheritAll="true" 
inheritRefs="true" />
   </target>
diff -r a8b6912d30a3 -r 688fcca7af57 legal/Licensing.txt
--- a/legal/Licensing.txt       Thu Dec 28 08:02:43 2017 +0000
+++ b/legal/Licensing.txt       Tue Feb 20 05:47:07 2018 +0000
@@ -52,6 +52,10 @@
 under the Compiere Public license 1.1 and are located in the /database/
 folder. For more information, see CompiereAddendum.txt in the /legal/ folder
 
+# src/org/openbravo/erpCommon/ad_callouts/ISO_4217.xml
+Currency XML from Swiss Association for Standardisation
+https://www.iso.org/iso-4217-currency-codes.html
+
 # calculator.js (at web/js)
 Under Tigra Calculator license (license available at 
http://www.softcomplex.com/)
 Copyright © 2003-2004 Softcomplex Inc. 
@@ -113,7 +117,7 @@
 # commons-pool-1.5.6.jar
 # fop-1.1.jar
 # jakarta-oro-2.0.8.jar
-# jettison-1.3.jar
+# jettison-1.3-patched.jar
 # log4j-1.2.16.jar
 # quartz-1.6.2.jar
 # servlet-api.jar 
@@ -181,7 +185,7 @@
 Under MPL/GPL License (available at 
https://developer.mozilla.org/en/Rhino_License)
 ob-rhino-1.6R7.jar is the same code as js.jar repackaged to be available under 
org.openbravo
 
-# javassist-3.14.0-GA.jar
+# javassist-3.20.0-GA.jar
 Under MPL License (included as MPL-1.1.txt in this folder)
 
 # slf4j-api-1.6.1.jar
diff -r a8b6912d30a3 -r 688fcca7af57 lib/README
--- a/lib/README        Thu Dec 28 08:02:43 2017 +0000
+++ b/lib/README        Tue Feb 20 05:47:07 2018 +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 a8b6912d30a3 -r 688fcca7af57 lib/runtime/hibernate3-patched.jar
Binary file lib/runtime/hibernate3-patched.jar has changed
diff -r a8b6912d30a3 -r 688fcca7af57 lib/runtime/javassist-3.14.0-GA.jar
Binary file lib/runtime/javassist-3.14.0-GA.jar has changed
diff -r a8b6912d30a3 -r 688fcca7af57 lib/runtime/javassist-3.20.0-GA.jar
Binary file lib/runtime/javassist-3.20.0-GA.jar has changed
diff -r a8b6912d30a3 -r 688fcca7af57 lib/runtime/jettison-1.3-patched.jar
Binary file lib/runtime/jettison-1.3-patched.jar has changed
diff -r a8b6912d30a3 -r 688fcca7af57 lib/runtime/jettison-1.3.jar
Binary file lib/runtime/jettison-1.3.jar has changed
diff -r a8b6912d30a3 -r 688fcca7af57 lib/runtime/renderFoRmi.jar
Binary file lib/runtime/renderFoRmi.jar has changed
diff -r a8b6912d30a3 -r 688fcca7af57 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Thu Dec 28 08:02:43 2017 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml 
    Tue Feb 20 05:47:07 2018 +0000
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and 
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.32857]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION><![CDATA[3.0.33164]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your 
finances with an ERP does not have to be difficult. Enjoy a radically improved 
user experience that combines the power of an enterprise grade financial 
application with the simplicity and ease of a web 2.0 personal accounting 
service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and 
Receivables Management simplifies and automates the business processes around 
the management of financial accounts, from the receipt and issue of payment, to 
the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in 
the forum discussions or register feature requests or issues in the 
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and 
Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with 
document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document 
types and default algorithm for bank statement auto 
matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  
<ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
diff -r a8b6912d30a3 -r 688fcca7af57 
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
--- 
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Thu Dec 28 08:02:43 2017 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
  Tue Feb 20 05:47:07 2018 +0000
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<STARTVERSION><![CDATA[2.1.33164]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User 
Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  
<STARTVERSION><![CDATA[3.0.33164]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r a8b6912d30a3 -r 688fcca7af57 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
  Thu Dec 28 08:02:43 2017 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
  Tue Feb 20 05:47:07 2018 +0000
@@ -382,28 +382,30 @@
               businessPartner.getCurrency().getISOCode()));
         }
         BigDecimal usedCreditAmt = 
selectedCreditPaymentAmounts.get(creditPayment.getId());
-        if (strDifferenceAction.equals("refund")) {
-          if (remainingRefundAmt.compareTo(usedCreditAmt) > 0) {
-            remainingRefundAmt = remainingRefundAmt.subtract(usedCreditAmt);
-            usedCreditAmt = BigDecimal.ZERO;
-          } else {
-            usedCreditAmt = usedCreditAmt.subtract(remainingRefundAmt);
-            remainingRefundAmt = BigDecimal.ZERO;
-          }
+
+        // Reset usedCredit by traversing through each credit payment
+        if (remainingRefundAmt.compareTo(usedCreditAmt) > 0) {
+          remainingRefundAmt = remainingRefundAmt.subtract(usedCreditAmt);
+          usedCreditAmt = BigDecimal.ZERO;
+        } else {
+          usedCreditAmt = usedCreditAmt.subtract(remainingRefundAmt);
+          remainingRefundAmt = BigDecimal.ZERO;
         }
-        final StringBuffer description = new StringBuffer();
-        if (creditPayment.getDescription() != null && 
!creditPayment.getDescription().equals("")) {
-          description.append(creditPayment.getDescription()).append("\n");
-        }
-        
description.append(String.format(OBMessageUtils.messageBD("APRM_CreditUsedPayment"),
-            payment.getDocumentNo()));
-        String truncateDescription = (description.length() > 255) ? 
description.substring(0, 251)
-            .concat("...").toString() : description.toString();
-        creditPayment.setDescription(truncateDescription);
+
         // Set Used Credit = Amount + Previous used credit introduced by the 
user
         
creditPayment.setUsedCredit(usedCreditAmt.add(creditPayment.getUsedCredit()));
 
         if (usedCreditAmt.compareTo(BigDecimal.ZERO) > 0) {
+          // Set Credit description only when it is actually used
+          final StringBuffer description = new StringBuffer();
+          if (creditPayment.getDescription() != null && 
!creditPayment.getDescription().equals("")) {
+            description.append(creditPayment.getDescription()).append("\n");
+          }
+          
description.append(String.format(OBMessageUtils.messageBD("APRM_CreditUsedPayment"),
+              payment.getDocumentNo()));
+          String truncateDescription = (description.length() > 255) ? 
description.substring(0, 251)
+              .concat("...").toString() : description.toString();
+          creditPayment.setDescription(truncateDescription);
           FIN_PaymentProcess.linkCreditPayment(payment, usedCreditAmt, 
creditPayment);
         }
         OBDal.getInstance().save(creditPayment);
diff -r a8b6912d30a3 -r 688fcca7af57 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java
 Thu Dec 28 08:02:43 2017 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentOnProcessActionHandler.java
 Tue Feb 20 05:47:07 2018 +0000
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2014-2016 Openbravo SLU
+ * All portions are Copyright (C) 2014-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -72,15 +72,26 @@
         String currencyId = jsonData.getString("currencyId");
         boolean usesCredit = jsonData.getBoolean("usesCredit");
         boolean generatesCredit = jsonData.getBoolean("generatesCredit");
-        if ((usesCredit || generatesCredit)
-            && !StringUtils.equals(currencyId, 
businessPartner.getCurrency().getId())) {
-          String message = 
String.format(OBMessageUtils.messageBD("APRM_CreditCurrency"),
-              businessPartner.getCurrency().getISOCode());
+
+        if (businessPartner.getCurrency() == null) {
+          String message = 
String.format(OBMessageUtils.messageBD("InitBPCurrencyLnk", false),
+              businessPartner.getId(), businessPartner.getName());
           errorMessage.put("severity", "error");
           errorMessage.put("title", "Error");
           errorMessage.put("text", message);
           result.put("message", errorMessage);
           return result;
+        } else {
+          if ((usesCredit || generatesCredit)
+              && !StringUtils.equals(currencyId, 
businessPartner.getCurrency().getId())) {
+            String message = 
String.format(OBMessageUtils.messageBD("APRM_CreditCurrency"),
+                businessPartner.getCurrency().getISOCode());
+            errorMessage.put("severity", "error");
+            errorMessage.put("title", "Error");
+            errorMessage.put("text", message);
+            result.put("message", errorMessage);
+            return result;
+          }
         }
 
       } else {
diff -r a8b6912d30a3 -r 688fcca7af57 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
      Thu Dec 28 08:02:43 2017 +0000
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
      Tue Feb 20 05:47:07 2018 +0000
@@ -11,7 +11,7 @@
  * under the License.

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

Reply via email to