Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 03 Feb 2015 06:09:01 +0100
changeset 25842 636ee4259003
parent 25785 a0bbb21686cf (current diff)
parent 25841 3170d211f2dd (diff)
child 25843 128a5d39aba2
Merge back from main
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/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
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/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.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.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.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.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.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/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/.hgsigs	Fri Jan 30 19:43:37 2015 -0500
+++ b/.hgsigs	Tue Feb 03 06:09:01 2015 +0100
@@ -159,4 +159,6 @@
 d8e24b51ba03c98d057048de5e86c1c8c977276f 0 iEYEABECAAYFAlRJO3UACgkQCX/oGf+2qkMMFQCeObdVCTDlec79H4alHs8t8SDMQ9YAoO4HfqRXTDGnDg5+LnLtuBxPsQDD
 924afa1490b09bc691895099f12204b2282b0ee9 0 iEYEABECAAYFAlRhoL8ACgkQCX/oGf+2qkNHkwCfeuBMGLqmtcdy8LxqPtcu8mRAlQIAnAjqdHUhM+pTFL5tdsaY1V9buvP9
 340ffd8d7a9d5f42c216d59bacb99a27253825b0 0 iEYEABECAAYFAlSAMJIACgkQCX/oGf+2qkPCvgCfUWYHrJ/CJAkuUbalTNWcKPdmipEAn0r9uP5bQjzfZG1qg1CqQPqyFeOk
+84cf6c6fe9b1028b39e631dfaa9819525353ac1b 0 iEYEABECAAYFAlSz9ogACgkQCX/oGf+2qkMWZwCdG/tS4LF6c3mnfKN2b/cQUUxyQKAAoIY7jjkcR03KUm1XWZO04hop8NS4
 53cc6ea75bb1d2065e367fa065b540334d4d514d 0 iEYEABECAAYFAlSYSdYACgkQCX/oGf+2qkPl4wCggC4EzYsyVitSyhbL2kWJlTZ2XXcAmwU0F1jbBoVlgyENCdW93qsA/uUF
+8651cad68d86877ad8a90a0f16ce994daca4c2c3 0 iEYEABECAAYFAlTLW8EACgkQCX/oGf+2qkPEPQCghnkxkVcLRQ5txQCvPqDfmX3OpWAAoOt8wvHw9mJLINJfaStIwhdZ062z
--- a/.hgtags	Fri Jan 30 19:43:37 2015 -0500
+++ b/.hgtags	Tue Feb 03 06:09:01 2015 +0100
@@ -170,4 +170,6 @@
 6af26661c789c5daa23e36e7367a05dfe291242e 3.0PR14Q3.2
 4ccbe7a7da1d0eed0677d7d0baf545607a192c87 3.0PR14Q3.3
 fc76bf00588598f913bd9a5bb1d45fdd692548fd 3.0PR14Q3.4
+6861ab13dc527af0dc41945a0d855de511b4c04c 3.0PR14Q3.5
 ed3565630685be1107627816bfd88379e174d7a7 3.0PR14Q4
+17ffddb263ab6fcea496938be6eb10b8c5c53729 3.0PR15Q1