Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 16 Mar 2016 05:33:34 +0100
changeset 28940 a58e284a2ce0
parent 28848 330cd48c5a70 (current diff)
parent 28939 52f41dec669a (diff)
child 28941 349fe0043820
child 28957 1295b207c102
child 28958 b22fb0500156
child 29033 05ad78bbb02e
Merge back from main
build.xml
legal/Licensing.txt
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRM_MatchingUtility.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml
src-db/database/model/functions/M_INOUT_POST.xml
src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml
src-db/database/model/functions/M_RESERVATION_POST.xml
src-db/database/model/triggers/GL_JOURNAL_CHK_RESTRICT_TRG.xml
src-db/database/model/triggers/M_PRODUCT_TRG.xml
src-db/database/model/triggers/M_RESERVATION_TRG.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_TABLE_NAVIGATION.xml
src-db/database/sourcedata/OBUIAPP_PROCESS.xml
src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java
src/org/openbravo/common/datasource/ReturnToFromCustomerVendorHQLTransformer.java
src/org/openbravo/costing/CostingMigrationProcess.java
src/org/openbravo/costing/CostingRuleProcess.java
src/org/openbravo/erpCommon/ad_forms/DocInventory.java
src/org/openbravo/erpCommon/utility/WindowTree.java
src/org/openbravo/event/ProductCharacteristicValueEventHandler.java
src/org/openbravo/service/importprocess/ImportEntryManager.java
--- a/.hgsigs	Tue Mar 15 19:12:36 2016 +0100
+++ b/.hgsigs	Wed Mar 16 05:33:34 2016 +0100
@@ -182,5 +182,10 @@
 9755d00af209f39887eba34a08922463fbcdac91 0 iEYEABECAAYFAlYt2zgACgkQCX/oGf+2qkN1KgCg6tzAQat0ZJJIWeFyr6yLRVCvh24AnjVyPbFPvbJ3/EOgUHtJWz5lWzeM
 d20a396ffa245fd3cdbadc3196df3554018d2e20 0 iEYEABECAAYFAlY4SL4ACgkQCX/oGf+2qkOjJACfS1q37UfrWobml4IVCOKqGeV+CU0An3iRcDJJ+N3aJMuzjkZh8xYe0mRQ
 089152094fe394f987fa18606cba401cc20283ec 0 iEYEABECAAYFAlZmVhkACgkQCX/oGf+2qkOFxgCaA0tF7KBDttIBpX4Iezn3GPqSqJQAoIO5TQRfs/Gpwo/lV48IaAIG94vJ
+6c3455925759761e11a3e14afee7d4bfa6d44b7b 0 iEYEABECAAYFAlagn5YACgkQCX/oGf+2qkO+bwCg5QR2pBchydWi0CYFTF0W0E3YP5AAoI2VCfXgMzocJ8AAeqsXRtetQ1pR
 d2c765a228d83098cc5f253cdd364abdb4a4697e 0 iEYEABECAAYFAlZOorMACgkQCX/oGf+2qkMFfwCgocaX6vsWuoGtE55aoHgBD1/7OKoAoOv4J31+P+8BtkVHJyKLhxGVBoLo
 cf00bd72641cd3d41f95c0610058f127dad7b91a 0 iEYEABECAAYFAlZv7k4ACgkQCX/oGf+2qkNDIgCeO9reaQhgk94B44p24tVR/E5NsccAoOoJYRH9w6b6sWOOQkRivfVjQwSv
+13daf93202e0933841632c91b1d4a887d9521e3c 0 iEYEABECAAYFAlahu2QACgkQCX/oGf+2qkPP3QCdFhiUHKeBfwEFsprfMiofZWZ1/wkAoN0Tjy/Hk2svUSV2vBYUf3uHGz+U
+24d2967df096de06913c9991553c1d84b07df9b6 0 iEYEABECAAYFAla9YYIACgkQCX/oGf+2qkNH7wCfV32iOyR/TQKzW/mH1iHTir6f6h4AoIlh4QBWIShpJqbJvx2IhfARpvUZ
+f016ea545c924ad099e9e402689035f1dd73baa2 0 iEYEABECAAYFAlbTzQoACgkQCX/oGf+2qkP28wCdFpNqpw+ODgF0p3cMJAbTZy1IPfoAoNEuRHkZIM5bNJMjwU0/GhjCtwah
+38ef1dc10aa3d6fb8210b85beab370f62a4545ca 0 iEYEABECAAYFAlbiTM0ACgkQCX/oGf+2qkNBDwCfXmKXkqNGsAsfiofYOBBdvjA/XgkAoIwLK3DkmHeM71JihwfVOWyB4hmj
--- a/.hgtags	Tue Mar 15 19:12:36 2016 +0100
+++ b/.hgtags	Wed Mar 16 05:33:34 2016 +0100
@@ -193,5 +193,10 @@
 9320a67a9ef1cafb5076d06bdd6d716abc662c40 3.0PR15Q3.2
 bce57079bd436cec545edb6c12246170862f0416 3.0PR15Q3.3
 8dabadcfecebf5aced31ed98411517afcb10d792 3.0PR15Q3.4
+0c91d0ae09c32dc46fc9e91f516ef36c6cdecda7 3.0PR15Q3.5
 84cd25c33900a44c955c5a899e570281f02e0ccc 3.0PR15Q4
 f698a5f953c867f7f7fefe86d7cca3ff80324181 3.0PR15Q4.1
+b6c50283d4a8ae24f54c0f0955601478ead7134d 3.0PR15Q4.2
+9985680adffaf70ffcc1f560860feb10f0ee6b33 3.0PR15Q4.3
+70df4e4c5cab6d37f10eceee6b66be039c381556 3.0PR15Q4.4
+ee5383e071318afe8eece515b4b264cfb46c1a84 3.0PR16Q1