Merge temporary head for 3.0PR15Q2
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 06 May 2015 16:31:31 +0000
changeset 26573 57aa62564121
parent 26535 3f83f6ab144b (current diff)
parent 26572 8a9b6695238a (diff)
child 26574 b833d1c3e6cf
Merge temporary head for 3.0PR15Q2
.hgsigs
.hgtags
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.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_REFERENCE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementActionHandler.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadGetPreferenceActionHandler.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementOnLoadPreferenceActionHandler.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js
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/src/org/openbravo/client/application/ApplicationComponentProvider.java
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-combo.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.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.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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
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/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_VAL_RULE.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src-test/src/org/openbravo/test/costing/TestCosting.java
src/org/openbravo/base/session/OBPropertiesProvider.java
src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java
src/org/openbravo/configuration/ConfigurationApp.java
src/org/openbravo/costing/CostingBackground.java
src/org/openbravo/costing/StandardAlgorithm.java
src/org/openbravo/erpCommon/ad_callouts/SE_Payment_BPartner.java
src/org/openbravo/erpCommon/ad_callouts/SE_Payment_Transaction.java
src/org/openbravo/erpCommon/ad_callouts/SE_StatementDate_Transaction.java
src/org/openbravo/erpCommon/ad_callouts/SE_Trxtype_Transaction.java
src/org/openbravo/erpCommon/ad_forms/DocCostAdjustment.java
src/org/openbravo/erpCommon/utility/OBMessageUtils.java
--- a/.hgsigs	Fri Apr 17 13:02:02 2015 +0000
+++ b/.hgsigs	Wed May 06 16:31:31 2015 +0000
@@ -168,3 +168,4 @@
 831f7c3e542951b324cd9880b198bb4751bfd251 0 iEYEABECAAYFAlTm9ToACgkQCX/oGf+2qkPpFgCgzIKSAc1CMJoGRySzaUNdjoiyXyUAn2N/WoGlO000oJ6LcEcBldIz3+iT
 295e0a259f619311101efee9f1d31aede5bdaa95 0 iEYEABECAAYFAlUZK3oACgkQCX/oGf+2qkOrywCdFORG9mDgA9SMY95tQrtMYtUftS0AoK6d8rFNeUz9xDvAP/y0B+2myvoN
 4d63b001f63758b1b79b9502621754878acdfdff 0 iEYEABECAAYFAlUwx7cACgkQCX/oGf+2qkOn2gCcCxKfDDCR1P8qYR9bNtxTIs81JY8AniiMcNvRgeOQ6DOF+jHHVksUM4eO
+ac761ac78f576cee64046e115ac42d2a3b227682 0 iEYEABECAAYFAlVItlgACgkQCX/oGf+2qkPgSACeNz58xoUWpTvMywmncbWx7+r7bnUAn1Ba1al80Q9HMY/wiMNu1Vfpd9Jo
--- a/.hgtags	Fri Apr 17 13:02:02 2015 +0000
+++ b/.hgtags	Wed May 06 16:31:31 2015 +0000
@@ -179,3 +179,4 @@
 39f3bed2ed0eaa2a7e69a46d7bf417c346e25a6a 3.0PR15Q1.1
 31dfe7896f8fcd9390b979d7c6972f5aea00d199 3.0PR15Q1.2
 ad409516bfa0b1c6f7ab128cab4526dd5058c787 3.0PR15Q1.3
+4239774eb8de8f0740bfbd6e3e36c075ee2a5a91 3.0PR15Q2