Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 06 May 2015 22:50:45 +0200
changeset 26552 b833d1c3e6cf
parent 26423 efe0becb4ae9 (current diff)
parent 26551 57aa62564121 (diff)
child 26553 5422fb661d82
child 26575 a1817f84bd8b
Merge back from main
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_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/process/FIN_AddPayment.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.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.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-date.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.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/process/ob-parameter-window-view.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-date.js
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
src-db/database/lib/dbsourcemanager.jar
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_CALLOUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.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-util/buildvalidation/src/org/openbravo/buildvalidation/GLJournalAccountingCheck_data.xsql
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/LandedCostDistributionAlgorithm.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_Trxtype_Transaction.java
src/org/openbravo/erpCommon/ad_callouts/SL_Journal_Period.java
src/org/openbravo/erpCommon/ad_forms/DocCostAdjustment.java
src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql
src/org/openbravo/erpCommon/utility/OBMessageUtils.java
--- a/.hgsigs	Wed May 06 12:00:17 2015 +0200
+++ b/.hgsigs	Wed May 06 22:50:45 2015 +0200
@@ -166,3 +166,6 @@
 53cc6ea75bb1d2065e367fa065b540334d4d514d 0 iEYEABECAAYFAlSYSdYACgkQCX/oGf+2qkPl4wCggC4EzYsyVitSyhbL2kWJlTZ2XXcAmwU0F1jbBoVlgyENCdW93qsA/uUF
 8651cad68d86877ad8a90a0f16ce994daca4c2c3 0 iEYEABECAAYFAlTLW8EACgkQCX/oGf+2qkPEPQCghnkxkVcLRQ5txQCvPqDfmX3OpWAAoOt8wvHw9mJLINJfaStIwhdZ062z
 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	Wed May 06 12:00:17 2015 +0200
+++ b/.hgtags	Wed May 06 22:50:45 2015 +0200
@@ -177,3 +177,6 @@
 ed3565630685be1107627816bfd88379e174d7a7 3.0PR14Q4
 17ffddb263ab6fcea496938be6eb10b8c5c53729 3.0PR15Q1
 39f3bed2ed0eaa2a7e69a46d7bf417c346e25a6a 3.0PR15Q1.1
+31dfe7896f8fcd9390b979d7c6972f5aea00d199 3.0PR15Q1.2
+ad409516bfa0b1c6f7ab128cab4526dd5058c787 3.0PR15Q1.3
+4239774eb8de8f0740bfbd6e3e36c075ee2a5a91 3.0PR15Q2