details: https://code.openbravo.com/erp/devel/main/rev/bfaf8a74c064 changeset: 18123:bfaf8a74c064 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Oct 03 11:40:52 2012 +0200 summary: Fixes issue 21808: Selects the last reconciliation making sure it returns only one record.
details: https://code.openbravo.com/erp/devel/main/rev/1881e367bf6c changeset: 18124:1881e367bf6c user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Sep 25 13:12:50 2012 +0200 summary: Fixes issue 21371: Allows to WriteOff the whole Payment and fixes an Issue when voiding a Payment with all amount writeoff. details: https://code.openbravo.com/erp/devel/main/rev/7748d65fe7c4 changeset: 18125:7748d65fe7c4 user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Oct 03 18:03:05 2012 +0200 summary: Fixed issue 21851: AltGr works ok again in classic popups in linux details: https://code.openbravo.com/erp/devel/main/rev/fa0e90f7e9ee changeset: 18126:fa0e90f7e9ee user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Oct 03 17:45:19 2012 +0000 summary: Update AD_MODULE version to 3.0MP15.1 details: https://code.openbravo.com/erp/devel/main/rev/2680cddd9aca changeset: 18127:2680cddd9aca user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Oct 03 17:45:20 2012 +0000 summary: Added tag 3.0MP15.1 for changeset fa0e90f7e9ee details: https://code.openbravo.com/erp/devel/main/rev/f2f5c9c694d7 changeset: 18128:f2f5c9c694d7 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Oct 03 17:45:21 2012 +0000 summary: Added signature for changeset 2680cddd9aca details: https://code.openbravo.com/erp/devel/main/rev/c2ddbdabe555 changeset: 18129:c2ddbdabe555 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Oct 05 07:18:23 2012 +0000 summary: Merge temporary head for 3.0MP15.1 diffstat: .hgsigs | 4 + .hgtags | 4 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 54 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 13 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 22 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 33 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml | 12 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentProposalPickEditLines.java | 82 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html | 90 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 37 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml | 10 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html | 96 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 49 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml | 8 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html | 49 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 23 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml | 10 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 15 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 41 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 50 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 2 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 30 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 12 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 26 + modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 9 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js | 10 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NOTE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java | 86 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java | 26 + modules/org.openbravo.client.application/src/org/openbravo/client/application/event/BusinessPartnerBankAccountHandler.java | 87 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 46 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 10 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js | 15 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js | 26 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 44 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 15 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 20 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 87 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 25 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js | 33 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 45 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 3 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 5 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TREENODE.xml | 2 +- modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java | 12 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java | 5 + modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorFieldPropertyDataSource.java | 8 + modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 20 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/configScript.xml | 8 - modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- referencedata/sampledata/F_B_International_Group.xml | 185564 +++++++++- referencedata/sampledata/QA_Testing.xml | 10491 +- src-db/database/model/functions/A_ASSET_POST.xml | 63 +- src-db/database/model/functions/C_CHANGEPROJECTSTATUSTOORDER.xml | 16 +- src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml | 66 + src-db/database/model/functions/C_GET_IBAN_DISPLAYED_ACCOUNT.xml | 82 + src-db/database/model/functions/C_PROJECT_WON.xml | 4 +- src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 529 +- src-db/database/model/functions/M_GET_OFFER_STD_PRICE.xml | 7 +- src-db/database/model/functions/M_INOUT_CANCEL.xml | 1 + src-db/database/model/functions/M_INOUT_CREATE.xml | 6 +- src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 3 + src-db/database/model/prescript-PostgreSql.sql | 2 +- src-db/database/model/tables/A_ASSET.xml | 5 + src-db/database/model/tables/C_BP_BANKACCOUNT.xml | 12 +- src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml | 29 +- src-db/database/model/tables/FIN_ORIG_PAYMENT_SCHEDULE.xml | 14 +- src-db/database/model/tables/FIN_ORIG_PAYM_SCHEDDETAIL.xml | 8 +- src-db/database/model/triggers/C_BP_BANKACCOUNTIBAN_TRG.xml | 83 +- src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml | 26 +- src-db/database/model/triggers/FIN_FINANCIAL_ACCOUNT_TRG2.xml | 34 +- src-db/database/model/triggers/M_PRODUCT_CATEGORY_TRG.xml | 6 +- src-db/database/model/triggers/M_PRODUCT_TRG.xml | 21 +- src-db/database/model/triggers/M_TRANSACTION_TRG.xml | 90 +- src-db/database/model/views/C_RM_ORDER_PICK_EDIT_LINES.xml | 2 +- src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml | 4 +- src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml | 5 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 44 + src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 529 +- src-db/database/sourcedata/AD_ELEMENT.xml | 143 +- src-db/database/sourcedata/AD_FIELD.xml | 662 +- src-db/database/sourcedata/AD_FIELDGROUP.xml | 9 + src-db/database/sourcedata/AD_MENU.xml | 6 +- src-db/database/sourcedata/AD_MESSAGE.xml | 157 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 8 +- src-db/database/sourcedata/AD_PROCESS_PARA.xml | 1 + src-db/database/sourcedata/AD_REFERENCE.xml | 36 + src-db/database/sourcedata/AD_REF_LIST.xml | 149 +- src-db/database/sourcedata/AD_TAB.xml | 36 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + src-db/database/sourcedata/AD_TREENODE.xml | 50 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 45 + src-db/database/sourcedata/AD_WINDOW.xml | 10 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 28 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 240 +- src-test/org/openbravo/test/AllTests.java | 2 - src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql | 2 + src/build.xml | 5 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 83 +- src/org/openbravo/common/actionhandler/RMShipmentPickEditLines.java | 92 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 105 +- src/org/openbravo/costing/AverageAlgorithm.java | 7 +- src/org/openbravo/costing/CostingBackground.java | 137 +- src/org/openbravo/costing/CostingRuleProcess.java | 11 +- src/org/openbravo/costing/CostingStatus.java | 20 +- src/org/openbravo/dal/service/OBDao.java | 8 + src/org/openbravo/dal/xml/EntityResolver.java | 11 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 39 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 13 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 9 + src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 71 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_MultiCurrency.java | 2 + src/org/openbravo/erpCommon/ad_callouts/SL_Depreciate.java | 50 + src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 3 +- src/org/openbravo/erpCommon/ad_callouts/SL_TaxCategory_Org.java | 45 + src/org/openbravo/erpCommon/ad_forms/About.html | 2 +- src/org/openbravo/erpCommon/ad_forms/Fact.java | 20 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 8 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 13 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html | 18 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 21 +- src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html | 32 +- src/org/openbravo/erpCommon/ad_forms/TranslationManager.java | 11 +- src/org/openbravo/erpCommon/ad_process/TestHeartbeat.java | 2 - src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html | 46 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java | 119 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchase.jrxml | 29 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchaseForeign.jrxml | 19 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSale.jrxml | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml | 19 +- src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java | 11 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 7 + src/org/openbravo/erpCommon/info/Locator.html | 1 + src/org/openbravo/erpCommon/info/Locator.java | 22 +- src/org/openbravo/erpCommon/info/Locator.xml | 1 + src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java | 182 + src/org/openbravo/erpCommon/modules/VersionUtility.java | 9 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 1 - src/org/openbravo/erpCommon/security/Login.html | 2 +- src/org/openbravo/erpCommon/security/Login.java | 4 +- src/org/openbravo/erpCommon/security/Login_F1.html | 2 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 1 + src/org/openbravo/erpCommon/utility/Utility.java | 3 +- src/org/openbravo/erpCommon/utility/WindowTree.html | 2 +- src/org/openbravo/erpCommon/utility/WindowTreeChecks.java | 4 + src/org/openbravo/erpCommon/utility/WindowTree_data.xsql | 11 + src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 2 +- src/org/openbravo/service/db/DataImportService.java | 2 +- web/js/jscalendar/calendar.js | 2 +- web/js/jscalendar/lang/calendar-ar.js | 127 + web/js/utils.js | 74 +- 209 files changed, 199891 insertions(+), 2774 deletions(-) diffs (truncated from 247043 to 300 lines): diff -r bf2e6628cebd -r c2ddbdabe555 .hgsigs --- a/.hgsigs Mon Sep 24 11:25:19 2012 +0000 +++ b/.hgsigs Fri Oct 05 07:18:23 2012 +0000 @@ -78,4 +78,8 @@ e73588ed4b71972072141cda206f2382c618fbc8 0 iEYEABECAAYFAlAlOJcACgkQCX/oGf+2qkN2uwCg1Nd3SJnzR1OdCXmMDHxOm/C8kEsAoMF+P+CltaPNylrKX7B4wimfTW/e a934dbe3f5fad31293f1a5a2cc6f2ca630fd0f31 0 iEYEABECAAYFAlAGLkgACgkQCX/oGf+2qkOu/ACfYJXb8JwO69uZVxLM2u6BHOwQHj4AoJ08uNluEH3iB94pfMnCsD2URUX8 110a8fe1328f4a9e7e5ff1179ace3e529286cfce 0 iEYEABECAAYFAlBN5pQACgkQCX/oGf+2qkN9ZACZAZXSsoFWJoDLsoqPj9aGd6QiEjoAoP79Il22Awt4fupQo3hqZL+JOYd9 +6476bb0e9da298f7adb7759265f784d9eb28884d 0 iEYEABECAAYFAlBkPuAACgkQCX/oGf+2qkMUxgCgglb7oUz6aO/2IC55x7u2xRy65HoAnj83lJHvsqrlllOquMxoLJ2UkTkO 3ef42df4953f5813543c5d1cb2b323d13c8c0359 0 iEYEABECAAYFAlA/cv4ACgkQCX/oGf+2qkMT3gCgjbewzyw3X/1MOZjn6V5P3HqrQtoAoPdsUsBzwVelyg7jpbUhhzGW5Vbz +d221450bb4d5334f101e6d0fe5d2e941bb714f0a 0 iEYEABECAAYFAlBqvAsACgkQCX/oGf+2qkNIogCfTU6AVwlfmEH2DZUjGkiE1zzo25MAoOkIN46+PHwWKslqp5lxFShVzVTd +7643bde3a4855fc35ddf7269a221ba0e77863a75 0 iEYEABECAAYFAlBgQyAACgkQCX/oGf+2qkNE2ACfb7Xzd4dq5VTeUnFo9VSsPqoQHtsAn063Puz1dhXpBsvhgkpbDV7fXiR6 +2680cddd9aca96f87a83156d3ca27935a692dfb3 0 iEYEABECAAYFAlBsebEACgkQCX/oGf+2qkMexACdFPyyCM6bMSTiXilJF9M61iXNBQ4AnAwzonIXgFkr4tyY1WHa+PGw3caA diff -r bf2e6628cebd -r c2ddbdabe555 .hgtags --- a/.hgtags Mon Sep 24 11:25:19 2012 +0000 +++ b/.hgtags Fri Oct 05 07:18:23 2012 +0000 @@ -89,4 +89,8 @@ 6319e314cf98d9fd0df44324e8a5b2aead800b54 3.0MP12.2 33314611486b1823d42d1059110369d7705ef13f 3.0MP13 0389ecbdda642f959d524d644f1a73a3bc27d57a 3.0MP13.1 +141c70bce6606bca6bf2b8422b9c27fbf19e7ede 3.0MP13.2 35168ddf12d33e94aeb18d2c79c6d9255a26c742 3.0MP14 +6861c9689350eae52de16fad01f78b37f5164c9e 3.0MP14.1 +bf2e6628cebd62b56796fe8433c35378d516e375 3.0MP15 +fa0e90f7e9eed2e99536b6c372a15a2448c03d06 3.0MP15.1 diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Fri Oct 05 07:18:23 2012 +0000 @@ -76,6 +76,9 @@ v_invoiceno_trl AD_Message.MsgText%TYPE; v_payment_desc AD_OrgInfo.em_aprm_payment_desc%TYPE; v_description_first BOOLEAN := TRUE; +v_finacct_currency VARCHAR2(32); +v_rate NUMBER; +v_PricePr NUMBER; TYPE RECORD IS REF CURSOR; Cur_Params RECORD; @@ -590,7 +593,8 @@ CASE WHEN v_IsSOTrx='Y' THEN AUTOMATIC_DEPOSIT ELSE AUTOMATIC_WITHDRAWN END AS CreateFinTransaction, CASE WHEN v_IsSOTrx='Y' THEN payin_execution_type ELSE payout_execution_type END AS ExecutionType, CASE WHEN v_IsSOTrx='Y' THEN payin_deferred ELSE payout_deferred END AS deferred, - CASE WHEN v_IsSOTrx='Y' THEN payin_execution_process_id ELSE payout_execution_process_id END AS execution_process_id + CASE WHEN v_IsSOTrx='Y' THEN payin_execution_process_id ELSE payout_execution_process_id END AS execution_process_id, + CASE WHEN v_IsSoTrx='Y' THEN Payin_IsMulticurrency ELSE Payout_IsMulticurrency END AS multicurrency FROM FIN_FINACC_PAYMENTMETHOD WHERE FIN_FINACC_PAYMENTMETHOD.FIN_PAYMENTMETHOD_ID = cur_paymentschedule.FIN_PAYMENTMETHOD_ID AND FIN_FINACC_PAYMENTMETHOD.FIN_FINANCIAL_ACCOUNT_ID = v_Financial_Account_ID @@ -760,19 +764,41 @@ v_ResultStr:='Generating FIN_FINACC_TRANSACTION'; v_FIN_FINACC_TRANSACTION_ID := GET_UUID(); SELECT COALESCE(MAX(LINE),0) INTO v_Line FROM FIN_FINACC_TRANSACTION WHERE FIN_FINANCIAL_ACCOUNT_ID = v_Financial_Account_ID; - INSERT INTO fin_finacc_transaction( - fin_finacc_transaction_id, ad_client_id, ad_org_id, created, - createdby, updated, updatedby, isactive, c_currency_id, fin_financial_account_id, - line, fin_payment_id, dateacct, c_glitem_id, status, paymentamt, - depositamt, processed, processing, posted, c_project_id, c_campaign_id, - c_activity_id, user1_id, user2_id, trxtype, statementdate, description, - fin_reconciliation_id) - VALUES (v_FIN_FINACC_TRANSACTION_ID, v_client_id, cur_paymentschedule.AD_ORG_ID, now(), p_user, - now(), p_user, 'Y', cur_paymentschedule.C_CURRENCY_ID, v_Financial_Account_ID, - v_Line, v_FIN_PAYMENT_ID, cur_paymentschedule.DUEDATE, NULL, CASE WHEN v_IsSOTrx='Y' THEN 'RDNC' ELSE 'PWNC' END, CASE WHEN v_IsSOTrx='N' THEN cur_paymentschedule.OUTSTANDINGAMT ELSE 0 END, - CASE WHEN v_IsSOTrx='Y' THEN cur_paymentschedule.OUTSTANDINGAMT ELSE 0 END, 'Y', 'N', 'N', v_project_id, v_campaign_id, - v_activity_id, v_user1, v_user2, CASE WHEN v_IsSOTrx='N' THEN 'BPW' ELSE 'BPD' END, cur_paymentschedule.DUEDATE, 'Invoice No.: ' || v_documentno, - NULL); + --check the currency of the invoice and the currency of the financial account + select c_currency_id into v_finacct_currency from FIN_Financial_Account where FIN_Financial_Account_id =v_Financial_Account_ID; + IF (v_finacct_currency<>cur_paymentschedule.C_CURRENCY_ID AND cur_finaccpaymentmethod.multicurrency='Y') THEN + v_rate := C_CURRENCY_RATE(cur_paymentschedule.C_CURRENCY_ID, v_finacct_currency, cur_paymentschedule.DUEDATE, NULL, v_client_id, cur_paymentschedule.AD_ORG_ID ); + SELECT priceprecision into v_PricePr from C_CURRENCY where c_currency_id = v_finacct_currency; + INSERT INTO fin_finacc_transaction( + fin_finacc_transaction_id, ad_client_id, ad_org_id, created, + createdby, updated, updatedby, isactive, c_currency_id, fin_financial_account_id, + line, fin_payment_id, dateacct, c_glitem_id, status, paymentamt, + depositamt, processed, processing, posted, c_project_id, c_campaign_id, + c_activity_id, user1_id, user2_id, trxtype, statementdate, description, + fin_reconciliation_id, foreign_currency_id, foreign_convert_rate, foreign_amount) + VALUES (v_FIN_FINACC_TRANSACTION_ID, v_client_id, cur_paymentschedule.AD_ORG_ID, now(), p_user, + now(), p_user, 'Y', v_finacct_currency, v_Financial_Account_ID, + v_Line, v_FIN_PAYMENT_ID, cur_paymentschedule.DUEDATE, NULL, CASE WHEN v_IsSOTrx='Y' THEN 'RDNC' ELSE 'PWNC' END, CASE WHEN v_IsSOTrx='N' THEN ROUND(cur_paymentschedule.OUTSTANDINGAMT*v_rate, v_PricePr) ELSE 0 END, + CASE WHEN v_IsSOTrx='Y' THEN ROUND(cur_paymentschedule.OUTSTANDINGAMT*v_rate, v_PricePr) ELSE 0 END, 'Y', 'N', 'N', v_project_id, v_campaign_id, + v_activity_id, v_user1, v_user2, CASE WHEN v_IsSOTrx='N' THEN 'BPW' ELSE 'BPD' END, cur_paymentschedule.DUEDATE, 'Invoice No.: ' || v_documentno, + NULL, cur_paymentschedule.C_CURRENCY_ID, v_rate , CASE WHEN v_IsSOTrx='N' THEN cur_paymentschedule.OUTSTANDINGAMT ELSE cur_paymentschedule.OUTSTANDINGAMT END); + ELSE + INSERT INTO fin_finacc_transaction( + fin_finacc_transaction_id, ad_client_id, ad_org_id, created, + createdby, updated, updatedby, isactive, c_currency_id, fin_financial_account_id, + line, fin_payment_id, dateacct, c_glitem_id, status, paymentamt, + depositamt, processed, processing, posted, c_project_id, c_campaign_id, + c_activity_id, user1_id, user2_id, trxtype, statementdate, description, + fin_reconciliation_id) + VALUES (v_FIN_FINACC_TRANSACTION_ID, v_client_id, cur_paymentschedule.AD_ORG_ID, now(), p_user, + now(), p_user, 'Y', cur_paymentschedule.C_CURRENCY_ID, v_Financial_Account_ID, + v_Line, v_FIN_PAYMENT_ID, cur_paymentschedule.DUEDATE, NULL, CASE WHEN v_IsSOTrx='Y' THEN 'RDNC' ELSE 'PWNC' END, CASE WHEN v_IsSOTrx='N' THEN cur_paymentschedule.OUTSTANDINGAMT ELSE 0 END, + CASE WHEN v_IsSOTrx='Y' THEN cur_paymentschedule.OUTSTANDINGAMT ELSE 0 END, 'Y', 'N', 'N', v_project_id, v_campaign_id, + v_activity_id, v_user1, v_user2, CASE WHEN v_IsSOTrx='N' THEN 'BPW' ELSE 'BPD' END, cur_paymentschedule.DUEDATE, 'Invoice No.: ' || v_documentno, + NULL); + END IF; + + UPDATE FIN_PAYMENT SET STATUS = CASE WHEN v_IsSOTrx='Y' THEN 'RDNC' ELSE 'PWNC' END WHERE FIN_PAYMENT_ID = v_FIN_PAYMENT_ID; --UPDATE FINANCIAL ACCOUNT CURRENT BALANCE diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml Fri Oct 05 07:18:23 2012 +0000 @@ -599,8 +599,8 @@ <!--C5BB574D9652494086707528FF8175D6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C5BB574D9652494086707528FF8175D6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C5BB574D9652494086707528FF8175D6--> <COLUMNNAME><![CDATA[EM_Aprm_Payment_Proposal_Pe]]></COLUMNNAME> -<!--C5BB574D9652494086707528FF8175D6--> <NAME><![CDATA[Payment Proposal Pick and Edit Lines]]></NAME> -<!--C5BB574D9652494086707528FF8175D6--> <PRINTNAME><![CDATA[Payment Proposal Pick and Edit Lines]]></PRINTNAME> +<!--C5BB574D9652494086707528FF8175D6--> <NAME><![CDATA[Select Expected Payments]]></NAME> +<!--C5BB574D9652494086707528FF8175D6--> <PRINTNAME><![CDATA[Select Expected Payments]]></PRINTNAME> <!--C5BB574D9652494086707528FF8175D6--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--C5BB574D9652494086707528FF8175D6--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--C5BB574D9652494086707528FF8175D6--></AD_ELEMENT> diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Fri Oct 05 07:18:23 2012 +0000 @@ -7820,9 +7820,9 @@ <!--8420366B8591339CE040007F010023A9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--8420366B8591339CE040007F010023A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8420366B8591339CE040007F010023A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--8420366B8591339CE040007F010023A9--> <NAME><![CDATA[Account No.]]></NAME> -<!--8420366B8591339CE040007F010023A9--> <DESCRIPTION><![CDATA[Account Number]]></DESCRIPTION> -<!--8420366B8591339CE040007F010023A9--> <HELP><![CDATA[The Account Number indicates the Number assigned to this account]]></HELP> +<!--8420366B8591339CE040007F010023A9--> <NAME><![CDATA[Displayed Account]]></NAME> +<!--8420366B8591339CE040007F010023A9--> <DESCRIPTION><![CDATA[Text that will identify this bank account]]></DESCRIPTION> +<!--8420366B8591339CE040007F010023A9--> <HELP><![CDATA[Text that will identify this bank account]]></HELP> <!--8420366B8591339CE040007F010023A9--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--8420366B8591339CE040007F010023A9--> <AD_TAB_ID><![CDATA[5B9941AC1F6A4529A76FCA7CDA0A7D7A]]></AD_TAB_ID> <!--8420366B8591339CE040007F010023A9--> <AD_COLUMN_ID><![CDATA[828EE0AE80515FA1E040007F010067C7]]></AD_COLUMN_ID> @@ -8341,9 +8341,9 @@ <!--8420366B85A3339CE040007F010023A9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--8420366B85A3339CE040007F010023A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8420366B85A3339CE040007F010023A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--8420366B85A3339CE040007F010023A9--> <NAME><![CDATA[Swift code]]></NAME> -<!--8420366B85A3339CE040007F010023A9--> <DESCRIPTION><![CDATA[Swift Code (Society of Worldwide Interbank Financial Telecommunications)]]></DESCRIPTION> -<!--8420366B85A3339CE040007F010023A9--> <HELP><![CDATA[The SWIFT code is an identifier of a Bank]]></HELP> +<!--8420366B85A3339CE040007F010023A9--> <NAME><![CDATA[SWIFT Code]]></NAME> +<!--8420366B85A3339CE040007F010023A9--> <DESCRIPTION><![CDATA[SWIFT Code (Society of Worldwide Interbank Financial Telecommunications)]]></DESCRIPTION> +<!--8420366B85A3339CE040007F010023A9--> <HELP><![CDATA[The SWIFT Code is an identifier of a Bank]]></HELP> <!--8420366B85A3339CE040007F010023A9--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--8420366B85A3339CE040007F010023A9--> <AD_TAB_ID><![CDATA[5B9941AC1F6A4529A76FCA7CDA0A7D7A]]></AD_TAB_ID> <!--8420366B85A3339CE040007F010023A9--> <AD_COLUMN_ID><![CDATA[828EE0AE804A5FA1E040007F010067C7]]></AD_COLUMN_ID> @@ -13009,6 +13009,7 @@ <!--BC1D6E2C80084926A4C0C50D50231568--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--BC1D6E2C80084926A4C0C50D50231568--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--BC1D6E2C80084926A4C0C50D50231568--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--BC1D6E2C80084926A4C0C50D50231568--> <EM_OBUIAPP_VALIDATOR><![CDATA[OB.APRM.validatePaymentProposalPickAndEdit]]></EM_OBUIAPP_VALIDATOR> <!--BC1D6E2C80084926A4C0C50D50231568--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--BC1D6E2C80084926A4C0C50D50231568--></AD_FIELD> diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Fri Oct 05 07:18:23 2012 +0000 @@ -220,6 +220,17 @@ <!--44973749BE9E47989F1E9D4A1C52EDEF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--44973749BE9E47989F1E9D4A1C52EDEF--></AD_MESSAGE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--><AD_MESSAGE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_MESSAGE_ID><![CDATA[48898A3B7F9141C0B9BFBDD9AE5FCF8F]]></AD_MESSAGE_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <VALUE><![CDATA[APRM_PeriodNotAvailableClearedItem]]></VALUE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTEXT><![CDATA[The period of the cleared item (%s) is not open or available.]]></MSGTEXT> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--></AD_MESSAGE> + <!--49C16126D1A141C398175B0632C08F95--><AD_MESSAGE> <!--49C16126D1A141C398175B0632C08F95--> <AD_MESSAGE_ID><![CDATA[49C16126D1A141C398175B0632C08F95]]></AD_MESSAGE_ID> <!--49C16126D1A141C398175B0632C08F95--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -231,6 +242,17 @@ <!--49C16126D1A141C398175B0632C08F95--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--49C16126D1A141C398175B0632C08F95--></AD_MESSAGE> +<!--4EA449F1999B4B01B02840DC7AF832D9--><AD_MESSAGE> +<!--4EA449F1999B4B01B02840DC7AF832D9--> <AD_MESSAGE_ID><![CDATA[4EA449F1999B4B01B02840DC7AF832D9]]></AD_MESSAGE_ID> +<!--4EA449F1999B4B01B02840DC7AF832D9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4EA449F1999B4B01B02840DC7AF832D9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4EA449F1999B4B01B02840DC7AF832D9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4EA449F1999B4B01B02840DC7AF832D9--> <VALUE><![CDATA[APRM_NotAllowWriteOff]]></VALUE> +<!--4EA449F1999B4B01B02840DC7AF832D9--> <MSGTEXT><![CDATA[This action is not allowed, write off limit exceeded]]></MSGTEXT> +<!--4EA449F1999B4B01B02840DC7AF832D9--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--4EA449F1999B4B01B02840DC7AF832D9--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--4EA449F1999B4B01B02840DC7AF832D9--></AD_MESSAGE> + <!--53ED8846C7984389AF83AC1DE983859E--><AD_MESSAGE> <!--53ED8846C7984389AF83AC1DE983859E--> <AD_MESSAGE_ID><![CDATA[53ED8846C7984389AF83AC1DE983859E]]></AD_MESSAGE_ID> <!--53ED8846C7984389AF83AC1DE983859E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Oct 05 07:18:23 2012 +0000 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.17885]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.18121]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> @@ -25,7 +25,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time. Fixed issue 15305.]]></UPDATEINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[MP15]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Oct 05 07:18:23 2012 +0000 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.17885]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.18121]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.17885]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.18121]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Fri Oct 05 07:18:23 2012 +0000 @@ -123,7 +123,7 @@ <!--8BEBA07E78124B2B92B764D9B452B209--> <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH> <!--8BEBA07E78124B2B92B764D9B452B209--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--8BEBA07E78124B2B92B764D9B452B209--> <ISRANGE><![CDATA[N]]></ISRANGE> -<!--8BEBA07E78124B2B92B764D9B452B209--> <DEFAULTVALUE><![CDATA[@C_GLItem_ID@]]></DEFAULTVALUE> +<!--8BEBA07E78124B2B92B764D9B452B209--> <DEFAULTVALUE><![CDATA[@SQL=SELECT name FROM C_GLItem WHERE C_GLItem_ID=@C_GLItem_ID@]]></DEFAULTVALUE> <!--8BEBA07E78124B2B92B764D9B452B209--> <AD_ELEMENT_ID><![CDATA[800080]]></AD_ELEMENT_ID> <!--8BEBA07E78124B2B92B764D9B452B209--></AD_PROCESS_PARA> diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Fri Oct 05 07:18:23 2012 +0000 @@ -304,7 +304,7 @@ <!--9380E9AFB1074FB98030E5549D7FF346--> <SEQNO><![CDATA[50]]></SEQNO> <!--9380E9AFB1074FB98030E5549D7FF346--> <TABLEVEL><![CDATA[1]]></TABLEVEL> <!--9380E9AFB1074FB98030E5549D7FF346--> <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW> -<!--9380E9AFB1074FB98030E5549D7FF346--> <ISINFOTAB><![CDATA[Y]]></ISINFOTAB> +<!--9380E9AFB1074FB98030E5549D7FF346--> <ISINFOTAB><![CDATA[N]]></ISINFOTAB> <!--9380E9AFB1074FB98030E5549D7FF346--> <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB> <!--9380E9AFB1074FB98030E5549D7FF346--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--9380E9AFB1074FB98030E5549D7FF346--> <HASTREE><![CDATA[N]]></HASTREE> diff -r bf2e6628cebd -r c2ddbdabe555 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Sep 24 11:25:19 2012 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Oct 05 07:18:23 2012 +0000 @@ -407,6 +407,17 @@ <!--3E2658BC7DB84BA5927989BB52FD1BF0--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--3E2658BC7DB84BA5927989BB52FD1BF0--></AD_TEXTINTERFACES> +<!--3ED793E7D0FE4C098FE79C589C292B6E--><AD_TEXTINTERFACES> +<!--3ED793E7D0FE4C098FE79C589C292B6E--> <AD_TEXTINTERFACES_ID><![CDATA[3ED793E7D0FE4C098FE79C589C292B6E]]></AD_TEXTINTERFACES_ID> +<!--3ED793E7D0FE4C098FE79C589C292B6E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3ED793E7D0FE4C098FE79C589C292B6E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3ED793E7D0FE4C098FE79C589C292B6E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3ED793E7D0FE4C098FE79C589C292B6E--> <TEXT><![CDATA[Write off the difference (Above limit)]]></TEXT> +<!--3ED793E7D0FE4C098FE79C589C292B6E--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> +<!--3ED793E7D0FE4C098FE79C589C292B6E--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--3ED793E7D0FE4C098FE79C589C292B6E--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--3ED793E7D0FE4C098FE79C589C292B6E--></AD_TEXTINTERFACES> + <!--3F26CEA4A0D9445EBC5B92785185D207--><AD_TEXTINTERFACES> <!--3F26CEA4A0D9445EBC5B92785185D207--> <AD_TEXTINTERFACES_ID><![CDATA[3F26CEA4A0D9445EBC5B92785185D207]]></AD_TEXTINTERFACES_ID> <!--3F26CEA4A0D9445EBC5B92785185D207--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -869,6 +880,17 @@ <!--745D4AD864BB431BB56352040E0E9C84--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--745D4AD864BB431BB56352040E0E9C84--></AD_TEXTINTERFACES> +<!--753CC44B776D4A55901CAD9D92D458AE--><AD_TEXTINTERFACES> +<!--753CC44B776D4A55901CAD9D92D458AE--> <AD_TEXTINTERFACES_ID><![CDATA[753CC44B776D4A55901CAD9D92D458AE]]></AD_TEXTINTERFACES_ID> +<!--753CC44B776D4A55901CAD9D92D458AE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--753CC44B776D4A55901CAD9D92D458AE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--753CC44B776D4A55901CAD9D92D458AE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--753CC44B776D4A55901CAD9D92D458AE--> <TEXT><![CDATA[Write off the difference (Above limit)]]></TEXT> +<!--753CC44B776D4A55901CAD9D92D458AE--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME> +<!--753CC44B776D4A55901CAD9D92D458AE--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--753CC44B776D4A55901CAD9D92D458AE--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--753CC44B776D4A55901CAD9D92D458AE--></AD_TEXTINTERFACES> + <!--756D726BEF3D402985AAD12657C5898D--><AD_TEXTINTERFACES> <!--756D726BEF3D402985AAD12657C5898D--> <AD_TEXTINTERFACES_ID><![CDATA[756D726BEF3D402985AAD12657C5898D]]></AD_TEXTINTERFACES_ID> <!--756D726BEF3D402985AAD12657C5898D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2871,4 +2893,15 @@ <!--FDC49CBE576447578B4648FB57C3C89C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--FDC49CBE576447578B4648FB57C3C89C--></AD_TEXTINTERFACES> ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
