Merge back from main
authorPriya Muthukumar <priya.muthukumar@openbravo.com>
Mon, 09 Jul 2012 12:16:39 +0200
changeset 17430 caac0a361f3e
parent 17414 74d816f9789d (current diff)
parent 17429 f018e25f3cba (diff)
child 17431 9f5eedec4e1a
Merge back from main
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.widgets/web/org.openbravo.client.widgets/twitter.html
modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js
referencedata/sampledata/F_B_International_Group.xml
src-db/database/sourcedata/AD_MODULE.xml
src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/AccountingTabsData.class
--- a/.hgsigs	Fri Jul 06 10:54:36 2012 +0200
+++ b/.hgsigs	Mon Jul 09 12:16:39 2012 +0200
@@ -74,3 +74,4 @@
 358b14e92651ccf4e020a1420bd0b25b662f35ba 0 iEYEABECAAYFAk+0CeUACgkQCX/oGf+2qkMSIQCg8m8XwFqk/oFw5Cq1odJNq3ZiHIEAn2MHDVw5hRV7eD+c/zNOnQnAnp1n
 844318ff24456a1905b684f09c9c8f7ace47c320 0 iEYEABECAAYFAk/pPW4ACgkQCX/oGf+2qkOKWgCgj9Z/3LJeZKGbSU+F2vvjb8e5tMsAn39e0czGuicNxPRDtB/o/7Q4p3Tk
 3680c0f596f2fe0f97d8bb1aeb84e2c314124542 0 iEYEABECAAYFAk/ipvEACgkQCX/oGf+2qkNetgCgyHS5dvbLKKKbSN/Qo4Psv2PvI80AmwQczT1lS/sxnlMJV/RDtj+2y4U+
+747753a54e2eecdc25f659780f62b70802b11735 0 iEYEABECAAYFAk/2WecACgkQCX/oGf+2qkOzUACcDDn8V+yk9lsiWNjYaKmHT27rmSgAoLrxg9SWAmwu7DBYqGfrqrB9Eanr
--- a/.hgtags	Fri Jul 06 10:54:36 2012 +0200
+++ b/.hgtags	Mon Jul 09 12:16:39 2012 +0200
@@ -85,3 +85,4 @@
 f96fd5be357082854f418944e69fb406ae0dcda6 3.0MP11
 fb07998d8c76243c27156403bb2735d6548c8831 3.0MP11.1
 2781e1fb77af40758a1e18d97f609c05a130a4e6 3.0MP12
+1b0f90676e38f67c46ea0f27b9c28beca1cbf79d 3.0MP12.1