details: https://code.openbravo.com/erp/devel/pi/rev/aebe5fda8932 changeset: 15252:aebe5fda8932 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Dec 23 14:01:30 2011 +0100 summary: Fixes issue 18818, Fixes issue 19363
details: https://code.openbravo.com/erp/devel/pi/rev/a5f8504156ea changeset: 15253:a5f8504156ea user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Dec 23 14:01:30 2011 +0100 summary: Fixes issue 18818, Fixes issue 19363 details: https://code.openbravo.com/erp/devel/pi/rev/a295858d3232 changeset: 15254:a295858d3232 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon Jan 30 19:11:21 2012 +0100 summary: Fixes issue 17231: Instead of showing the invoice once, it is showing as many times as orders gathers details: https://code.openbravo.com/erp/devel/pi/rev/9c4928b3f1e5 changeset: 15255:9c4928b3f1e5 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon Jan 30 19:27:50 2012 +0100 summary: merge details: https://code.openbravo.com/erp/devel/pi/rev/4115718d84a0 changeset: 15256:4115718d84a0 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jan 31 10:54:16 2012 +0100 summary: merge diffstat: .hgsigs | 2 + .hgtags | 2 + modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 77 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 166 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 19 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 40 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.srpt | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.xml | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 17 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 32 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 79 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java | 7 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 1 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js | 9 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section-audit.js | 8 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-onchange-registry.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 35 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 31 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 71 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 17 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 50 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 61 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 24 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 14 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/GetLabelActionHandler.java | 28 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/JSCompressor.java | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java | 44 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/event/PersistenceEventOBInterceptor.java | 23 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/event/TransactionBeginEvent.java | 49 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/event/TransactionCompletedEvent.java | 49 + modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java | 3 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java | 3 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_WINDOW.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 33 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_URL.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 67 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml | 1153 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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 | 2 +- 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 | 2 +- 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 | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/configScript.xml | 10 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/functions/AD_UPDATE_PINSTANCE.xml | 9 +- src-db/database/model/functions/C_CHANGEPROJECTSTATUSTOORDER.xml | 8 +- src-db/database/model/functions/C_INVOICE_POST.xml | 2 +- src-db/database/model/functions/C_ORDER_POST1.xml | 37 +- src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml | 16 +- src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml | 1159 +- src-db/database/model/functions/M_GET_STOCK.xml | 450 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 14 +- src-db/database/model/tables/AD_USER.xml | 2 +- src-db/database/model/tables/C_POC_CONFIGURATION.xml | 8 + src-db/database/sourcedata/AD_CALLOUT.xml | 12 + src-db/database/sourcedata/AD_COLUMN.xml | 76 +- src-db/database/sourcedata/AD_ELEMENT.xml | 26 + src-db/database/sourcedata/AD_FIELD.xml | 58 +- src-db/database/sourcedata/AD_FORM.xml | 17 +- src-db/database/sourcedata/AD_MENU.xml | 44 +- src-db/database/sourcedata/AD_MESSAGE.xml | 264 + 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 | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 82 +- src-db/database/sourcedata/AD_REFERENCE.xml | 13 + src-db/database/sourcedata/AD_REF_LIST.xml | 44 + src-db/database/sourcedata/AD_TAB.xml | 200 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 132 + src-db/database/sourcedata/AD_WINDOW.xml | 123 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 2 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 2 +- src-wad/src/org/openbravo/wad/WadActionButton.java | 2 +- src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 4 +- src/org/openbravo/base/model/Entity.java | 18 +- src/org/openbravo/base/secureApp/UserLock.java | 5 +- src/org/openbravo/dal/core/OBContext.java | 7 +- src/org/openbravo/dal/security/EntityAccessChecker.java | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java | 36 +- src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql | 18 +- src/org/openbravo/erpCommon/ad_actionButton/CreateStandards.java | 7 +- src/org/openbravo/erpCommon/ad_callouts/EmailConfiguration_Port.java | 46 + src/org/openbravo/erpCommon/ad_callouts/SE_CalculateExchangeRate.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 30 +- src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_ProcessPlan.java | 9 +- src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 20 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 117 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 36 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 29 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 183 +- src/org/openbravo/erpCommon/ad_forms/DocInOut.java | 118 +- src/org/openbravo/erpCommon/ad_forms/DocInventory.java | 27 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html | 9 +- src/org/openbravo/erpCommon/ad_process/AlertProcess.java | 19 + src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesComparativeJR.jrxml | 5309 ++++++++++ src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql | 26 +- src/org/openbravo/erpCommon/businessUtility/EMail.java | 7 +- src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java | 6 + src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 7 +- src/org/openbravo/erpCommon/info/Location.java | 19 +- src/org/openbravo/erpCommon/info/Location_F1.html | 1 + src/org/openbravo/erpCommon/info/Location_F1.xml | 1 + src/org/openbravo/erpCommon/security/Login.html | 4 +- src/org/openbravo/erpCommon/security/Login_F1.html | 4 +- src/org/openbravo/erpCommon/utility/WindowTreeChecks.java | 5 +- src/org/openbravo/erpCommon/utility/WindowTree_data.xsql | 11 +- src/org/openbravo/erpCommon/utility/poc/EmailManager.java | 28 +- src/org/openbravo/erpCommon/utility/poc/Poc_Configuration_data.xsql | 10 +- src/org/openbravo/erpCommon/utility/reporting/printing/EmailOptions.html | 37 +- src/org/openbravo/erpCommon/utility/reporting/printing/Email_data.xsql | 2 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 54 +- src/org/openbravo/erpReports/RptM_InOut.jrxml | 99 +- src/org/openbravo/erpReports/Rptm_InOut_Lines.jrxml | 8 +- src/org/openbravo/scheduling/OBScheduler.java | 8 +- src/org/openbravo/scheduling/Trigger_data.xsql | 6 +- web/js/genericTree.js | 9 +- web/js/utils.js | 4 +- 168 files changed, 9343 insertions(+), 2414 deletions(-) diffs (truncated from 17371 to 300 lines): diff -r dd8e5b8f8fa6 -r 4115718d84a0 .hgsigs --- a/.hgsigs Mon Jan 09 11:55:28 2012 +0100 +++ b/.hgsigs Tue Jan 31 10:54:16 2012 +0100 @@ -53,3 +53,5 @@ 29635597c9b7110b66a4cde8e0cb0ece277f7407 0 iEYEABECAAYFAk7l05YACgkQCX/oGf+2qkNbCACgoK+bQ83JFW2GQb4j+YBkkBkrMOYAoKDSHPagp61WCcrPkCS7IEtmVI0E bc63869ec25d6771e0b3d3b65ddd630873663fc2 0 iEYEABECAAYFAk7h3vAACgkQCX/oGf+2qkP/HwCgt39R5/w8cF35rRoORikICeXQuDYAn347sM4ST4OvagS5ke9c6whsBYud 5bb9eb1d86194a2fcf8779d28ee7bb131c53f20d 0 iEYEABECAAYFAk8BnJcACgkQCX/oGf+2qkMN7wCg+wl5wJjx0Y60WgZq3PRlBi3T3OoAmQGlwF1vK52FNykjDiACN+7Xdzjh +d034d0b54ffb6c401b3741be99d4237f82aa9d76 0 iEYEABECAAYFAk8EN/IACgkQCX/oGf+2qkMPzgCg/gXTYW5Vv9s02aG3VAi3lSvNiMwAn29/22CruqkJ9sTWkyA8lCChqk/r +aa474df671aa2c3d4a16419479cf8098d5fbca82 0 iEYEABECAAYFAk8N8JAACgkQCX/oGf+2qkMFLACbB+b+pdKa0rd7O+ig6so/ETi1x0YAnRKPM91wMwdONWZ5AOazDoSj6h/c diff -r dd8e5b8f8fa6 -r 4115718d84a0 .hgtags --- a/.hgtags Mon Jan 09 11:55:28 2012 +0100 +++ b/.hgtags Tue Jan 31 10:54:16 2012 +0100 @@ -64,3 +64,5 @@ efa17c6fbb3b286f790ea5b029b1f6fd2b1e5195 3.0MP5.3 1b8d2b0f0c3f8af08af1d86f0f3f3c252319b0fa 3.0MP6 5b449c72b2e674843a4f8949d34aa46e2fced9ea 3.0MP6.1 +5e317c1d2b1e4486fa345a5dd0ba3982e596c8cf 3.0MP7 +ed6c72ed7483eeb5a797ae9e1e7dd8775802a4eb 3.0MP7.1 diff -r dd8e5b8f8fa6 -r 4115718d84a0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Mon Jan 09 11:55:28 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Tue Jan 31 10:54:16 2012 +0100 @@ -38,6 +38,7 @@ v_bpartner_id c_order.c_bpartner_id%TYPE; v_docSubType c_doctype.docsubtypeso%TYPE; v_PaymentPriority VARCHAR(32); +v_count NUMBER; TYPE RECORD IS REF CURSOR; Cur_Params RECORD; @@ -75,13 +76,25 @@ FROM c_order WHERE c_order_id = p_record_id; - SELECT docsubtypeso - INTO v_docSubType + SELECT COALESCE(docsubtypeso, '---') INTO v_docSubType FROM c_doctype WHERE c_doctype_id = v_C_Doctype_ID; - IF(v_docSubType is null or v_docSubType not in ('OB', 'ON')) THEN - IF (p_docaction = 'CO') THEN + SELECT count(*) INTO v_count + FROM fin_payment_schedule + WHERE c_order_id = p_record_id + -- Migrated orders with related debt-payments have an additional fin_payment_schedule with the paid amount. + -- These additional fin_payment_schedules do not have fin_payment_scheduledetail records. + AND EXISTS (SELECT 1 FROM fin_payment_scheduledetail + WHERE fin_payment_schedule_order = fin_payment_schedule.fin_payment_schedule_id); + IF (v_count > 1) THEN + RAISE_APPLICATION_ERROR(-20000, '@APRM_Multiple_Payment_Schedules@'); + END IF; + + IF(v_docSubType in ('OB', 'ON')) THEN + RETURN; + END IF; + IF (p_docaction = 'CO') THEN -- Checking Payment Method ID is available IF(v_paymentmethod_id IS NULL) THEN RAISE_APPLICATION_ERROR(-20000, '@APRM_PAYMENTMETHOD_MISSING@'); @@ -166,7 +179,6 @@ ELSIF (p_docaction = 'RE') THEN -- check there is not any paid payment DECLARE - v_count NUMBER; Cur_PaymentScheduleDetail RECORD; BEGIN SELECT count(*) INTO v_count @@ -200,22 +212,59 @@ ELSIF (p_docaction = 'CL') THEN DECLARE v_difference NUMBER; + v_FinPaymentScheduleId VARCHAR2(32); + v_FinPaymentScheduleDetailId VARCHAR2(32); + v_psd_amt NUMBER; BEGIN - SELECT sum(amount) - v_grandtotal INTO v_difference + SELECT v_grandtotal - sum(amount) INTO v_difference FROM fin_payment_schedule WHERE c_order_id = p_record_id; + + SELECT ps.fin_payment_schedule_id INTO v_finpaymentscheduleid + FROM fin_payment_schedule ps + WHERE ps.c_order_id=p_record_id + AND EXISTS (SELECT 1 FROM fin_payment_scheduledetail WHERE fin_payment_schedule_order = ps.fin_payment_schedule_id); + IF (v_difference <> 0) THEN - UPDATE fin_payment_schedule - SET amount = amount - v_difference, - outstandingamt = outstandingamt - v_difference, - updated = now(), - updatedby = p_user - WHERE c_order_id = p_record_id - AND outstandingamt > v_difference; + --Get fin_payment_scheduledetail not related to payments nor invoices. + SELECT fin_payment_scheduledetail_id, amount + INTO v_finpaymentscheduledetailid, v_psd_amt + FROM fin_payment_scheduledetail + WHERE fin_payment_schedule_order = v_finpaymentscheduleid + AND fin_payment_schedule_invoice IS NULL + AND fin_payment_detail_id IS NULL; + IF (v_finpaymentscheduledetailid IS NOT NULL) THEN + --If exists a psd not related to any invoice nor invoice update its amount with the difference. + IF (v_psd_amt * -1 = v_difference) THEN + -- If amounts are equal we delete the psd + DELETE FROM fin_payment_scheduledetail + WHERE fin_payment_scheduledetail_id = v_finpaymentscheduledetailid; + ELSE + UPDATE fin_payment_scheduledetail + SET amount = amount + v_difference + WHERE fin_payment_scheduledetail_id = v_finpaymentscheduledetailid; + END IF; + ELSE + -- If not exists a psd to update create one with the difference + INSERT INTO fin_payment_scheduledetail ( + fin_payment_scheduledetail_id, ad_client_id, ad_org_id, isactive, + created, createdby, updated, updatedby, + fin_payment_detail_id, fin_payment_schedule_order, fin_payment_schedule_invoice, + amount, writeoffamt, iscanceled + ) VALUES ( + get_uuid(), v_Client_ID, v_Org_ID,'Y', + now(), p_user, now(), p_user, + null, v_FinPaymentScheduleId, null, + v_difference, 0 ,'N' + ); + END IF; + UPDATE fin_payment_schedule + SET amount = amount + v_difference, + outstandingamt = outstandingamt + v_difference + WHERE fin_payment_schedule_id = v_FinPaymentScheduleId; END IF; END; END IF; - END IF; EXCEPTION WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('APRM_GENERATE_PAYMENT_SCHEDULE exception: '|| v_ResultStr); diff -r dd8e5b8f8fa6 -r 4115718d84a0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Mon Jan 09 11:55:28 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Tue Jan 31 10:54:16 2012 +0100 @@ -66,6 +66,17 @@ <!--19D77522B7A4470FBA505D39A6AA051C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--19D77522B7A4470FBA505D39A6AA051C--></AD_MESSAGE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--><AD_MESSAGE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <AD_MESSAGE_ID><![CDATA[1E8BFED210524080A7F8FE17D6C4DED1]]></AD_MESSAGE_ID> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <VALUE><![CDATA[APRM_Multiple_Payment_Schedules]]></VALUE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <MSGTEXT><![CDATA[The order has more than one Payment Plan record with related Payment Plan details. Please contact your System Administrator to fix it.]]></MSGTEXT> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--1E8BFED210524080A7F8FE17D6C4DED1--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--1E8BFED210524080A7F8FE17D6C4DED1--></AD_MESSAGE> + <!--1EB0D3A668784AF8A9133F066EDE6C44--><AD_MESSAGE> <!--1EB0D3A668784AF8A9133F066EDE6C44--> <AD_MESSAGE_ID><![CDATA[1EB0D3A668784AF8A9133F066EDE6C44]]></AD_MESSAGE_ID> <!--1EB0D3A668784AF8A9133F066EDE6C44--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r dd8e5b8f8fa6 -r 4115718d84a0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 09 11:55:28 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jan 31 10:54:16 2012 +0100 @@ -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.15056]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.15244]]></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> diff -r dd8e5b8f8fa6 -r 4115718d84a0 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 Jan 09 11:55:28 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jan 31 10:54:16 2012 +0100 @@ -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.15056]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.15244]]></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.15056]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.15244]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r dd8e5b8f8fa6 -r 4115718d84a0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Mon Jan 09 11:55:28 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Tue Jan 31 10:54:16 2012 +0100 @@ -61,6 +61,7 @@ <!--6707D7449A8D45DB851F608BA88329C8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--6707D7449A8D45DB851F608BA88329C8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--6707D7449A8D45DB851F608BA88329C8--> <NAME><![CDATA[Payment Out Details]]></NAME> +<!--6707D7449A8D45DB851F608BA88329C8--> <HELP><![CDATA[Displays the details of the payments (pre-payments or regular payments) made for the order or for the invoice/s of the order.]]></HELP> <!--6707D7449A8D45DB851F608BA88329C8--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> <!--6707D7449A8D45DB851F608BA88329C8--> <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID> <!--6707D7449A8D45DB851F608BA88329C8--> <SEQNO><![CDATA[36]]></SEQNO> @@ -141,7 +142,7 @@ <!--A94442B27F664A41BF64735DFA76FB4D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A94442B27F664A41BF64735DFA76FB4D--> <NAME><![CDATA[Payment Out Plan]]></NAME> <!--A94442B27F664A41BF64735DFA76FB4D--> <DESCRIPTION><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></DESCRIPTION> -<!--A94442B27F664A41BF64735DFA76FB4D--> <HELP><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></HELP> +<!--A94442B27F664A41BF64735DFA76FB4D--> <HELP><![CDATA[List of the scheduled payments expected against the invoice.]]></HELP> <!--A94442B27F664A41BF64735DFA76FB4D--> <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID> <!--A94442B27F664A41BF64735DFA76FB4D--> <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID> <!--A94442B27F664A41BF64735DFA76FB4D--> <SEQNO><![CDATA[32]]></SEQNO> @@ -167,6 +168,7 @@ <!--B82C02920AA84E8DB57D553185BD2F06--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--B82C02920AA84E8DB57D553185BD2F06--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B82C02920AA84E8DB57D553185BD2F06--> <NAME><![CDATA[Payment In Details]]></NAME> +<!--B82C02920AA84E8DB57D553185BD2F06--> <HELP><![CDATA[Displays the details of the payments (pre-payments or regular payments) received for the order or for the invoice/s of the order.]]></HELP> <!--B82C02920AA84E8DB57D553185BD2F06--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> <!--B82C02920AA84E8DB57D553185BD2F06--> <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID> <!--B82C02920AA84E8DB57D553185BD2F06--> <SEQNO><![CDATA[46]]></SEQNO> @@ -220,7 +222,7 @@ <!--EB0466B2A22343F28773B356D292BC7E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--EB0466B2A22343F28773B356D292BC7E--> <NAME><![CDATA[Payment In Plan]]></NAME> <!--EB0466B2A22343F28773B356D292BC7E--> <DESCRIPTION><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></DESCRIPTION> -<!--EB0466B2A22343F28773B356D292BC7E--> <HELP><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></HELP> +<!--EB0466B2A22343F28773B356D292BC7E--> <HELP><![CDATA[List of the scheduled payments expected against the invoice.]]></HELP> <!--EB0466B2A22343F28773B356D292BC7E--> <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID> <!--EB0466B2A22343F28773B356D292BC7E--> <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID> <!--EB0466B2A22343F28773B356D292BC7E--> <SEQNO><![CDATA[50]]></SEQNO> @@ -246,6 +248,7 @@ <!--EB0E0C5A58344F7FA345097E7365CD22--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--EB0E0C5A58344F7FA345097E7365CD22--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--EB0E0C5A58344F7FA345097E7365CD22--> <NAME><![CDATA[Payment In Plan]]></NAME> +<!--EB0E0C5A58344F7FA345097E7365CD22--> <HELP><![CDATA[Shows the total amount expected to be collected upon order booking as well as the amount/s pre-paid or paid against the invoice/s for the order.]]></HELP> <!--EB0E0C5A58344F7FA345097E7365CD22--> <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID> <!--EB0E0C5A58344F7FA345097E7365CD22--> <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID> <!--EB0E0C5A58344F7FA345097E7365CD22--> <SEQNO><![CDATA[45]]></SEQNO> @@ -272,7 +275,7 @@ <!--F9751D712A804D57B97A36803843F2D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--F9751D712A804D57B97A36803843F2D7--> <NAME><![CDATA[Payment Out Details]]></NAME> <!--F9751D712A804D57B97A36803843F2D7--> <DESCRIPTION><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></DESCRIPTION> -<!--F9751D712A804D57B97A36803843F2D7--> <HELP><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></HELP> +<!--F9751D712A804D57B97A36803843F2D7--> <HELP><![CDATA[Display the details of the payments made against the invoice.]]></HELP> <!--F9751D712A804D57B97A36803843F2D7--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> <!--F9751D712A804D57B97A36803843F2D7--> <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID> <!--F9751D712A804D57B97A36803843F2D7--> <SEQNO><![CDATA[33]]></SEQNO> @@ -298,6 +301,7 @@ <!--FA57D75B1BBB4583B4A777008A29BF54--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FA57D75B1BBB4583B4A777008A29BF54--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FA57D75B1BBB4583B4A777008A29BF54--> <NAME><![CDATA[Payment Out Plan]]></NAME> +<!--FA57D75B1BBB4583B4A777008A29BF54--> <HELP><![CDATA[Shows the total amount expected to be paid upon order booking as well as the amount/s pre-paid or paid against the invoice/s for the order.]]></HELP> <!--FA57D75B1BBB4583B4A777008A29BF54--> <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID> <!--FA57D75B1BBB4583B4A777008A29BF54--> <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID> <!--FA57D75B1BBB4583B4A777008A29BF54--> <SEQNO><![CDATA[35]]></SEQNO> @@ -324,7 +328,7 @@ <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <NAME><![CDATA[Payment In Details]]></NAME> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <DESCRIPTION><![CDATA[List of payment in made details against a particular invoice based on the payment in plan..]]></DESCRIPTION> -<!--FD40D9C2F1F14943933DEFEF4A8458E4--> <HELP><![CDATA[List of payment in made details against a particular invoice based on the payment in plan..]]></HELP> +<!--FD40D9C2F1F14943933DEFEF4A8458E4--> <HELP><![CDATA[Display the details of the payments received against the invoice.]]></HELP> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID> <!--FD40D9C2F1F14943933DEFEF4A8458E4--> <SEQNO><![CDATA[51]]></SEQNO> diff -r dd8e5b8f8fa6 -r 4115718d84a0 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Mon Jan 09 11:55:28 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Tue Jan 31 10:54:16 2012 +0100 @@ -23,7 +23,10 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -89,8 +92,7 @@ String strDueDateFrom = vars.getStringParameter("inpDueDateFrom", ""); String strDueDateTo = vars.getStringParameter("inpDueDateTo", ""); String strDocumentType = vars.getStringParameter("inpDocumentType", ""); - String strSelectedPaymentDetails = vars.getInStringParameter("inpScheduledPaymentDetailId", - IsIDFilter.instance); + String strSelectedPaymentDetails = vars.getInStringParameter("inpScheduledPaymentDetailId"); boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y"); Boolean showAlternativePM = "Y".equals(vars.getStringParameter("inpAlternativePaymentMethod", filterYesNo)); @@ -107,8 +109,8 @@ strAction = vars.getRequiredStringParameter("inpActionDocument"); } String strPaymentId = vars.getRequiredStringParameter("inpfinPaymentId"); - String strSelectedScheduledPaymentDetailIds = vars.getInParameter( - "inpScheduledPaymentDetailId", "", IsIDFilter.instance); + String strSelectedScheduledPaymentDetailIds = vars.getInStringParameter( + "inpScheduledPaymentDetailId", ""); String strAddedGLItems = vars.getStringParameter("inpGLItems"); JSONArray addedGLITemsArray = null; try { @@ -142,8 +144,8 @@ List<FIN_PaymentScheduleDetail> selectedPaymentDetails = FIN_Utility.getOBObjectList( FIN_PaymentScheduleDetail.class, strSelectedScheduledPaymentDetailIds); ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
