details: https://code.openbravo.com/erp/devel/pi/rev/e72425b17d36 changeset: 33866:e72425b17d36 user: Armaignac <collazoandy4 <at> gmail.com> date: Fri Mar 30 20:38:22 2018 -0400 summary: Fixes issue 37482: unused PL variables - functional
details: https://code.openbravo.com/erp/devel/pi/rev/36350507a8ac changeset: 33867:36350507a8ac user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Mon Apr 23 17:20:41 2018 +0200 summary: Related to issue 37482: Code review improvements diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 3 - modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml | 3 +- src-db/database/model/functions/A_ASSET_CREATE.xml | 35 +--- src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml | 1 + src-db/database/model/functions/C_CASH_POST.xml | 78 +--------- src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml | 10 +- src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml | 7 +- src-db/database/model/functions/C_CURRENCY_CONVERT.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml | 3 +- src-db/database/model/functions/C_CURRENCY_RATE.xml | 3 +- src-db/database/model/functions/C_GETWITHHOLDING.xml | 15 +- src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml | 3 +- src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml | 3 +- src-db/database/model/functions/C_INVOICE_CREATE0.xml | 3 +- src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml | 3 +- src-db/database/model/functions/C_INVOICE_POST.xml | 35 +---- src-db/database/model/functions/C_ORDER_POST1.xml | 4 +- src-db/database/model/functions/C_PROJECT_WON.xml | 8 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 4 +- src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml | 3 +- src-db/database/model/functions/MRP_PURCHASEPLAN.xml | 5 +- src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 5 +- src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 8 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 3 +- src-db/database/model/functions/M_INOUT_CREATE0.xml | 3 +- src-db/database/model/functions/M_INOUT_POST.xml | 1 - src-db/database/model/functions/M_MOVEMENT_POST.xml | 1 + src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml | 3 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 3 +- src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml | 3 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 3 +- 37 files changed, 76 insertions(+), 207 deletions(-) diffs (truncated from 1140 to 300 lines): diff -r b83da0b5cd1b -r 36350507a8ac 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 Wed Apr 25 10:15:44 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Mon Apr 23 17:20:41 2018 +0200 @@ -1072,8 +1072,6 @@ ELSIF (p_docaction = 'RE') THEN DECLARE - v_count NUMBER; - v_documentno VARCHAR2(40); v_PaymentPlanExpectedTotal NUMBER:= 0; BEGIN SELECT count(*), max(p.documentno) @@ -1171,7 +1169,6 @@ ELSIF (p_docaction = 'RC') THEN DECLARE - v_count NUMBER; v_prepaymentamt NUMBER; BEGIN v_delete_paymentplan := TRUE; diff -r b83da0b5cd1b -r 36350507a8ac 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 Wed Apr 25 10:15:44 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Mon Apr 23 17:20:41 2018 +0200 @@ -16,7 +16,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2013-2015 Openbravo SLU +* All portions are Copyright (C) 2013-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -97,7 +97,6 @@ DECLARE v_payment_schedule_order VARCHAR2(32); - v_count NUMBER; v_pendingamount NUMBER; cur_invoicepayments RECORD; BEGIN diff -r b83da0b5cd1b -r 36350507a8ac modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Wed Apr 25 10:15:44 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Mon Apr 23 17:20:41 2018 +0200 @@ -19,7 +19,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2011-2016 Openbravo SLU +* All portions are Copyright (C) 2011-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -106,6 +106,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_ispaymentconfirmed exception'); RAISE; + RETURN NULL; END APRM_ISPAYMENTCONFIRMED ]]></body> </function> diff -r b83da0b5cd1b -r 36350507a8ac modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Wed Apr 25 10:15:44 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Mon Apr 23 17:20:41 2018 +0200 @@ -22,7 +22,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2015 Openbravo SLU +* All portions are Copyright (C) 2015-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -43,6 +43,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_seqnumberinvoicepaidstatus exception'); RAISE; + RETURN NULL; END APRM_SEQNOINVPAIDSTATUS ]]></body> </function> diff -r b83da0b5cd1b -r 36350507a8ac modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Wed Apr 25 10:15:44 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Mon Apr 23 17:20:41 2018 +0200 @@ -16,7 +16,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2014-2017 Openbravo SLU +* All portions are Copyright (C) 2014-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -49,6 +49,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_seqnumberpaymentstatus exception'); RAISE; + RETURN NULL; END APRM_SEQNUMBERPAYMENTSTATUS ]]></body> </function> diff -r b83da0b5cd1b -r 36350507a8ac src-db/database/model/functions/A_ASSET_CREATE.xml --- a/src-db/database/model/functions/A_ASSET_CREATE.xml Wed Apr 25 10:15:44 2018 +0200 +++ b/src-db/database/model/functions/A_ASSET_CREATE.xml Mon Apr 23 17:20:41 2018 +0200 @@ -22,7 +22,7 @@ * parts created by ComPiere are Copyright (C) ComPiere, Inc.; * All Rights Reserved. * Contributor(s): Openbravo SLU - * Contributions are Copyright (C) 2001-2016 Openbravo, S.L.U. + * Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U. * * Specifically, this derivative work is based upon the following Compiere * file and version. @@ -35,16 +35,13 @@ * - Reversal or Negative Delivery * - Guarantee Extension ************************************************************************/ - -- Logistice - v_ResultStr VARCHAR2(2000):=''; - v_Message VARCHAR2(2000):=''; - v_Result NUMBER:=1; -- 0=failure - v_Record_ID VARCHAR2(32); - -- Parameter - TYPE RECORD IS REF CURSOR; - Cur_Parameter RECORD; + -- Logistice + v_ResultStr VARCHAR2(2000):=''; + v_Message VARCHAR2(2000):=''; + v_Result NUMBER:=1; -- 0=failure -- Parameter Variables -- Create from ShipmentLine + TYPE RECORD IS REF CURSOR; Cur_ShipLine RECORD; -- v_A_Asset_ID VARCHAR2(32) ; @@ -59,28 +56,8 @@ DBMS_OUTPUT.PUT_LINE('A_Asset_Create - Processing ' || p_PInstance_ID) ; v_ResultStr:='PInstanceNotFound'; AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'Y', NULL, NULL) ; - -- Get Parameters - v_ResultStr:='ReadingParameters'; - FOR Cur_Parameter IN - (SELECT i.Record_ID, i.AD_User_ID, p.ParameterName, p.P_String, p.P_Number, p.P_Date - FROM AD_PInstance i - LEFT JOIN AD_PInstance_Para p - ON i.AD_PInstance_ID=p.AD_PInstance_ID - WHERE i.AD_PInstance_ID=p_PInstance_ID - ORDER BY p.SeqNo - ) - LOOP - v_Record_ID:=Cur_Parameter.Record_ID; - -- IF (p.ParameterName = 'xx') THEN - -- p_xx := p.P_String; - -- DBMS_OUTPUT.PUT_LINE(' xx=' || p_xx); - -- ELSE - -- DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' || p.ParameterName); - -- END IF; - END LOOP; -- Get Parameter END IF; BEGIN --BODY - -- DBMS_OUTPUT.PUT_LINE(' Record_ID=' || v_Record_ID || ', InOutLine_ID=' || p_InOutLine_ID); -- Create From Shipment Line IF(p_InOutLine_ID IS NOT NULL) THEN FOR Cur_ShipLine IN diff -r b83da0b5cd1b -r 36350507a8ac src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml --- a/src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml Wed Apr 25 10:15:44 2018 +0200 +++ b/src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml Mon Apr 23 17:20:41 2018 +0200 @@ -35,6 +35,7 @@ AND ad_module_id <> '0'; IF (v_count > 1) THEN v_dummy := AD_GET_PREFERENCE_VALUE('CCU', 'Y', v_client_id, v_org_id, NULL, NULL, NULL); + DBMS_OUTPUT.PUT_LINE('CCU preference value: ' || v_dummy); ELSIF (v_count = 0) THEN UPDATE C_BPARTNER SET SO_CreditUsed= diff -r b83da0b5cd1b -r 36350507a8ac src-db/database/model/functions/C_CASH_POST.xml --- a/src-db/database/model/functions/C_CASH_POST.xml Wed Apr 25 10:15:44 2018 +0200 +++ b/src-db/database/model/functions/C_CASH_POST.xml Mon Apr 23 17:20:41 2018 +0200 @@ -20,7 +20,7 @@ * parts created by ComPiere are Copyright (C) ComPiere, Inc.; * All Rights Reserved. * Contributor(s): Openbravo SLU - * Contributions are Copyright (C) 1999-2016 Openbravo, S.L.U. + * Contributions are Copyright (C) 1999-2018 Openbravo, S.L.U. ************************************************************************* * $Id: C_Cash_Post.sql,v 1.10 2003/03/17 20:32:25 jjanke Exp $ *** @@ -32,7 +32,6 @@ ************************************************************************/ -- Logistice v_ResultStr VARCHAR2(2000):=''; - v_Result NUMBER; v_Message VARCHAR2(2000):=''; v_Record_ID VARCHAR2(32) ; v_User VARCHAR2(32); @@ -73,7 +72,6 @@ v_CB_Date DATE; v_AD_Org_ID VARCHAR2(32); v_AD_Client_ID VARCHAR2(32); - v_C_CashBook_ID VARCHAR2(32) ; FINISH_PROCESS BOOLEAN:=false; BEGIN -- Update AD_PInstance @@ -104,27 +102,14 @@ POSTED, AD_Org_ID, AD_Client_ID, - C_CASHBOOK_ID, DateAcct + DateAcct INTO v_Processed, v_Posted, v_AD_Org_ID, v_AD_Client_ID, - v_C_CashBook_ID, v_dateCash + v_dateCash FROM C_CASH WHERE C_Cash_ID=v_Record_ID; - /* Not needed: payments are updated to pending status - SELECT COUNT(*) INTO v_Count - FROM C_CASHLINE - WHERE C_CASH_ID = v_Record_ID - AND C_ORDER_ID IS NOT NULL - AND C_DEBT_PAYMENT_ID IS NOT NULL; - DBMS_OUTPUT.PUT_LINE(' Record_ID=' || v_Record_ID); - IF (v_Processed = 'Y' AND v_Count>0) THEN - v_Message := '@AlreadyPosted@'; - v_Result := 0; - FINISH_PROCESS := true; - END IF; - */ IF(NOT FINISH_PROCESS) THEN IF(v_Posted='Y') THEN RAISE_APPLICATION_ERROR(-20000, '@CashDocumentPosted@') ; @@ -342,7 +327,6 @@ ; IF v_count>0 THEN v_Message:='@CashOrderInvoiced@. Line:'||v_line; - v_Result:=0; FINISH_PROCESS:=true; END IF; END IF;--FINISH_PROCESS @@ -476,45 +460,6 @@ END IF;--FINISH_PROCESS IF(NOT FINISH_PROCESS) THEN /** - * Generate C_debt_payment for cashline with order type - */ - /* Now this goes to c_order_post ALO - DECLARE - v_debtPaymentID varchar2(32); - CurCashLinesOrder RECORD; - BEGIN - FOR CurCashLinesOrder IN (SELECT o.AD_CLIENT_ID, o.AD_ORG_ID, o.ISSOTRX, o.DOCUMENTNO, bp.NAME, o.POREFERENCE, o.C_ORDER_ID, o.C_BPARTNER_ID, - o.C_CURRENCY_ID, cl.C_CASHLINE_ID, o.PAYMENTRULE, C_Currency_Convert((cl.Amount + cl.WriteOffAmt), - cl.C_Currency_ID, o.C_Currency_ID, c.DateAcct, NULL, c.AD_Client_ID, c.AD_Org_ID) AMT, - c.STATEMENTDATE, o.C_PROJECT_ID - FROM C_CASHLINE cl, C_ORDER o, C_BPARTNER bp, C_CASH c - WHERE cl.C_ORDER_ID = o.C_ORDER_ID - AND cl.C_CASH_ID = v_Record_ID - AND bp.C_BPARTNER_ID = o.C_BPARTNER_ID - AND C.C_CASH_ID = cl.C_CASH_id) LOOP - Ad_Sequence_Next('C_Debt_Payment', v_Record_ID, v_debtPaymentID); - INSERT INTO C_DEBT_PAYMENT(C_DEBT_PAYMENT_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, - ISRECEIPT, C_SETTLEMENT_CANCEL_ID, C_SETTLEMENT_GENERATE_ID, DESCRIPTION, - C_ORDER_ID, C_BPARTNER_ID, - C_CURRENCY_ID, C_CASHLINE_ID, C_BANKACCOUNT_ID, C_CASHBOOK_ID, PAYMENTRULE, - ISPAID, AMOUNT, WRITEOFFAMT, DATEPLANNED, ISMANUAL, ISVALID, - C_BANKSTATEMENTLINE_ID, CHANGESETTLEMENTCANCEL, CANCEL_PROCESSED, GENERATE_PROCESSED, c_project_id) - VALUES - (v_debtPaymentID, CurCashLinesOrder.AD_CLIENT_ID, CurCashLinesOrder.AD_ORG_ID, 'Y', now(), v_User, now(), v_User, - CurCashLinesOrder.IsSOTrx, NULL, NULL, 'Order No: ' || CurCashLinesOrder.DOCUMENTNO || ' (' || CurCashLinesOrder.Name || (CASE WHEN CurCashLinesOrder.POREFERENCE IS NULL THEN '' ELSE ' .Ref:'||TO_CHAR(CurCashLinesOrder.POREFERENCE) END) || ')', - CurCashLinesOrder.C_ORDER_ID, CurCashLinesOrder.C_BPartner_ID, - CurCashLinesOrder.C_CURRENCY_ID, NULL,NULL,v_C_CashBook_ID, CurCashLinesOrder.PAYMENTRULE, - 'N',(CASE CurCashLinesOrder.IsSOTrx WHEN 'Y' THEN CurCashLinesOrder.AMT ELSE (-1)*CurCashLinesOrder.AMT END),0,CurCashLinesOrder.STATEMENTDATE,'N','Y', - NULL,'N','N','N',CurCashLinesOrder.C_PROJECT_ID); - UPDATE C_CASHLINE - SET C_DEBT_PAYMENT_ID = v_debtPaymentID, - Updated=now(), - UpdatedBy=v_User - WHERE C_CASHLINE_ID = CurCashLinesOrder.C_CASHLINE_ID; - END LOOP; - END; - */ - /** * Generate C_Settlement */ SELECT COUNT(*) @@ -577,7 +522,6 @@ */ DECLARE v_Total NUMBER:=0; - v_Currency_ID VARCHAR2(32):=NULL; -- Lines Cur_Lines RECORD; BEGIN @@ -593,23 +537,7 @@ Updated=now(), UpdatedBy=v_User WHERE C_Debt_Payment_ID=Cur_Lines.C_Debt_Payment_ID; - SELECT C_Currency_ID - INTO v_Currency_ID ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
