Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 28 Dec 2017 11:02:19 +0000
changeset 33141 2d08095cb5a6
parent 33128 045519e056d3 (current diff)
parent 33140 003641e96c0b (diff)
child 33164 5277301a598c
Merge back from main
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/RoleInfo.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoComponent.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java
modules/org.openbravo.client.kernel/src-test/org/openbravo/client/kernel/freemarker/test/LabelTest.java
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/I18NComponent.java
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelComponentProvider.java
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl
src-db/database/model/tables/C_IMPORT_ENTRY_ARCHIVE.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Fri Dec 22 17:38:18 2017 -0500
+++ b/.hgsigs	Thu Dec 28 11:02:19 2017 +0000
@@ -221,3 +221,4 @@
 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
--- a/.hgtags	Fri Dec 22 17:38:18 2017 -0500
+++ b/.hgtags	Thu Dec 28 11:02:19 2017 +0000
@@ -232,3 +232,4 @@
 688697b19d3692d75972558eaf9fc5eccd145a61 3.0PR17Q2.4
 a8925ad2d61f4625aa62c1ee31babecaa73b787f 3.0PR17Q3
 452e6c576f1db52e686cf3138099790e242e7927 3.0PR17Q3.1
+f500d43a59bb69265a7aa704a9fd20bffd68c8a9 3.0PR17Q3.2