Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 09 May 2018 05:00:42 +0000
changeset 33936 140e25aff39f
parent 33923 3952682173bf (current diff)
parent 33935 84416a0203c9 (diff)
child 33937 6f50b0fae846
Merge back from main
build.xml
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java
referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml
src-core/build.xml
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
src-db/database/sourcedata/AD_MODULE.xml
src-util/buildvalidation/build.xml
src/org/openbravo/erpCommon/modules/ImportModule.java
src/org/openbravo/erpCommon/utility/SystemInfo.java
--- a/.hgsigs	Mon May 07 11:27:06 2018 -0400
+++ b/.hgsigs	Wed May 09 05:00:42 2018 +0000
@@ -229,3 +229,4 @@
 b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC
 c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb
 9bad88c00b5da708f3e9c1abacd25ea6e6cfd664 0 iEUEABECAAYFAlrXODoACgkQCX/oGf+2qkOblACg0WOwH27TgkH75iKw2Y9tNYxSL8oAl3j0FbjQF6F05ESzZC0l3Uv2Nfg=
+dc2ef98dc38f7c32c888dcf1f1adb37c6afb4d14 0 iEYEABECAAYFAlrxbisACgkQCX/oGf+2qkMMCwCdFeF47f2MY7Pq3cdsyHon64EYekwAoPYllLnhYETGsUEqtiKSxvj9Mgxb
--- a/.hgtags	Mon May 07 11:27:06 2018 -0400
+++ b/.hgtags	Wed May 09 05:00:42 2018 +0000
@@ -240,3 +240,4 @@
 46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1
 03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1
 650aaadd6b6c5fda4f7ad957701face4fa4c3317 3.0PR18Q1.2
+307b23f7635f3e92dd8fc8e7d55d09b7c914384c 3.0PR18Q2