diff -r ecd83704f4fc 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 Fri Nov 24 17:36:51 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Thu Dec 14 16:09:22 2017 +0100 @@ -21,11 +21,9 @@ * Contributor(s): ______________________________________. ************************************************************************/ -p_message VARCHAR(2000); p_record_id VARCHAR(60); p_docAction VARCHAR(60); p_user VARCHAR(60); -p_result NUMBER; v_ResultStr VARCHAR2(2000):=''; v_GrandTotal NUMBER:=0; @@ -57,10 +55,6 @@ p_record_id := cur_params.p_string; ELSIF (cur_params.parametername LIKE 'User') THEN p_user := cur_params.p_string; - ELSIF (cur_params.parametername LIKE 'Message') THEN - p_message := cur_params.p_text; - ELSIF (cur_params.parametername LIKE 'Result') THEN - p_result := cur_params.p_number; END IF; END LOOP; diff -r ecd83704f4fc modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Thu Dec 14 16:09:22 2017 +0100 @@ -26,8 +26,6 @@ p_GLItem VARCHAR2(32); p_Amount NUMBER; p_IsReceipt CHAR(1); -p_message VARCHAR(2000); -p_result NUMBER; v_TaxPaymentName VARCHAR2(60); v_FinancialAccountName VARCHAR2(60); @@ -77,10 +75,6 @@ p_amount := cur_params.p_number; ELSIF (cur_params.parametername LIKE 'IsReceipt') THEN p_isReceipt := cur_params.p_string; - ELSIF (cur_params.parametername LIKE 'Message') THEN - p_message := cur_params.p_text; - ELSIF (cur_params.parametername LIKE 'Result') THEN - p_result := cur_params.p_number; END IF; END LOOP; diff -r ecd83704f4fc src-db/database/model/functions/A_ASSET_CREATE.xml --- a/src-db/database/model/functions/A_ASSET_CREATE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/A_ASSET_CREATE.xml Thu Dec 14 16:09:22 2017 +0100 @@ -40,7 +40,6 @@ v_Message VARCHAR2(2000):=''; v_Result NUMBER:=1; -- 0=failure v_Record_ID VARCHAR2(32); - v_AD_User_ID VARCHAR2(32); -- Parameter TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; @@ -72,7 +71,6 @@ ) LOOP v_Record_ID:=Cur_Parameter.Record_ID; - v_AD_User_ID:=Cur_Parameter.AD_User_ID; -- IF (p.ParameterName = 'xx') THEN -- p_xx := p.P_String; -- DBMS_OUTPUT.PUT_LINE(' xx=' || p_xx); diff -r ecd83704f4fc src-db/database/model/functions/A_ASSET_POST.xml --- a/src-db/database/model/functions/A_ASSET_POST.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/A_ASSET_POST.xml Thu Dec 14 16:09:22 2017 +0100 @@ -35,45 +35,33 @@ -- Record Info v_count NUMBER; v_Processing A_ASSET.Processing%TYPE; - v_Processed A_ASSET.Processed%TYPE; - v_ACCTVALUEAMT NUMBER; v_AD_CLIENT_ID VARCHAR2(32); v_AD_ORG_ID VARCHAR2(32); - v_AD_USER_ID VARCHAR2(32); - v_AMORTIZATIONENDDATE DATE; v_AMORTIZATIONSTARTDATE DATE; v_AMORTIZATIONTYPE VARCHAR2(60) ; v_AMORTIZATIONVALUEAMT NUMBER; v_AMORTIZATIONPERCENTAGE NUMBER; - v_ASSETDEPRECIATIONDATE DATE; - v_ASSETVALUEAMT NUMBER; v_C_CURRENCY_ID VARCHAR2(32); v_CREATEDBY varchar2(32); - v_ISDEPRECIATED CHAR(1) ; - v_RESIDUALASSETVALUEAMT NUMBER; v_ORIGUSELIFEMONTHS NUMBER; v_USELIFEMONTHS NUMBER; V_MONTHS NUMBER; v_USELIFEYEARS NUMBER; v_ORIGUSELIFEYEARS NUMBER; v_ASSETSCHEDULE VARCHAR2(60) ; - v_TOTAL_DAYS NUMBER; v_BEGINING_DATE DATE; v_ENDING_DATE DATE; - v_AUXAMT NUMBER; v_NEW_AMORTIZATION VARCHAR2(32); v_LINE NUMBER; v_SEQ_ASSET NUMBER; v_AMORTIZATIONLINE varchar2(32); v_FIRST_DAY_DATE DATE; - v_LAST_DAY_DATE DATE; v_PERCENTAGE NUMBER; v_AMOUNT NUMBER; v_CURRENCY_ID VARCHAR2(32); FINISH_PROCESS BOOLEAN:=false; v_DepreciatedLines NUMBER; v_DepreciatedPlan NUMBER; - v_depreciatedValue NUMBER; v_Period NUMBER; v_DEPRECIATEDPREVIOUSAMT NUMBER; v_AMORTIZATIONCALCTYPE VARCHAR2(60) ; @@ -120,8 +108,8 @@ WHERE A_asset_ID=v_Record_ID ) WHERE a_Asset_ID=v_Record_ID; - SELECT ACCTVALUEAMT, AD_CLIENT_ID, AD_ORG_ID, AD_USER_ID, AMORTIZATIONENDDATE, AMORTIZATIONSTARTDATE, AMORTIZATIONTYPE, AMORTIZATIONVALUEAMT, ANNUALAMORTIZATIONPERCENTAGE, ASSETDEPRECIATIONDATE, ASSETVALUEAMT, C_CURRENCY_ID, CREATEDBY, ISDEPRECIATED, PROCESSING, RESIDUALASSETVALUEAMT, USELIFEMONTHS, USELIFEMONTHS, USELIFEYEARS,USELIFEYEARS, ASSETSCHEDULE, PROCESSED, C_CURRENCY_ID, depreciatedPlan, COALESCE(depreciatedValue,0), COALESCE(DEPRECIATEDPREVIOUSAMT,0), AMORTIZATIONCALCTYPE, C_PROJECT_ID - INTO v_ACCTVALUEAMT, v_AD_CLIENT_ID, v_AD_ORG_ID, v_AD_USER_ID, v_AMORTIZATIONENDDATE, v_AMORTIZATIONSTARTDATE, v_AMORTIZATIONTYPE, v_AMORTIZATIONVALUEAMT, v_AMORTIZATIONPERCENTAGE, v_ASSETDEPRECIATIONDATE, v_ASSETVALUEAMT, v_C_CURRENCY_ID, v_CREATEDBY, v_ISDEPRECIATED, v_PROCESSING, v_RESIDUALASSETVALUEAMT, v_USELIFEMONTHS, v_ORIGUSELIFEMONTHS, v_USELIFEYEARS, v_ORIGUSELIFEYEARS, v_ASSETSCHEDULE, v_PROCESSED, v_CURRENCY_ID, v_DepreciatedPlan, v_depreciatedValue, v_DEPRECIATEDPREVIOUSAMT, v_AMORTIZATIONCALCTYPE, v_PROJECT_ID + SELECT AD_CLIENT_ID, AD_ORG_ID, AMORTIZATIONSTARTDATE, AMORTIZATIONTYPE, AMORTIZATIONVALUEAMT, ANNUALAMORTIZATIONPERCENTAGE, C_CURRENCY_ID, CREATEDBY, PROCESSING, USELIFEMONTHS, USELIFEMONTHS, USELIFEYEARS,USELIFEYEARS, ASSETSCHEDULE, C_CURRENCY_ID, depreciatedPlan, COALESCE(DEPRECIATEDPREVIOUSAMT,0), AMORTIZATIONCALCTYPE, C_PROJECT_ID + INTO v_AD_CLIENT_ID, v_AD_ORG_ID, v_AMORTIZATIONSTARTDATE, v_AMORTIZATIONTYPE, v_AMORTIZATIONVALUEAMT, v_AMORTIZATIONPERCENTAGE, v_C_CURRENCY_ID, v_CREATEDBY, v_PROCESSING, v_USELIFEMONTHS, v_ORIGUSELIFEMONTHS, v_USELIFEYEARS, v_ORIGUSELIFEYEARS, v_ASSETSCHEDULE, v_CURRENCY_ID, v_DepreciatedPlan, v_DEPRECIATEDPREVIOUSAMT, v_AMORTIZATIONCALCTYPE, v_PROJECT_ID FROM A_ASSET WHERE A_ASSET_ID=v_Record_ID; DBMS_OUTPUT.PUT_LINE('A_Asset_ID=' || v_Record_ID || ' - AMORTIZATIONTYPE=' || v_AMORTIZATIONTYPE) ; @@ -181,7 +169,6 @@ v_Count:=coalesce(v_depreciatedLines, 0) +1; v_BEGINING_DATE:=v_AMORTIZATIONSTARTDATE; v_FIRST_DAY_DATE:=TO_DATE('01-01-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') ; - v_LAST_DAY_DATE:=TO_DATE('31-12-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') ; if v_Count>1 then v_BEGINING_DATE:=TO_DATE('31-12-' || to_char(TO_number(to_char(v_BEGINING_DATE, 'yyyy')) +v_Count-1), 'DD-MM-YYYY') ; v_USELIFEYEARS:=v_USELIFEYEARS+ (1- (to_number(TO_DATE('31-12-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') - v_AMORTIZATIONSTARTDATE) / @@ -193,13 +180,9 @@ else v_PercentageGeneral := (100-(v_depreciatedPlan*100/(v_AMORTIZATIONVALUEAMT-v_DEPRECIATEDPREVIOUSAMT))) / (v_USELIFEYEARS-v_DepreciatedLines); --v_PercentageGeneral:=((v_AMORTIZATIONVALUEAMT-v_DEPRECIATEDPREVIOUSAMT-v_depreciatedPlan) *100/v_AMORTIZATIONVALUEAMT) /(v_USELIFEYEARS-v_DepreciatedLines) ; - SELECT to_number(TO_DATE(ADD_MONTHS(v_AMORTIZATIONSTARTDATE, 12*v_USELIFEYEARS)) - v_AMORTIZATIONSTARTDATE) - INTO v_TOTAL_DAYS - FROM DUAL; end if; v_AMORTIZATIONVALUEAMT:=v_AMORTIZATIONVALUEAMT-v_DEPRECIATEDPREVIOUSAMT; - v_AUXAMT:=0; v_PERCENTAGE:=0; v_TotalAmt:=coalesce(v_DepreciatedPlan, 0) ; finish:=false; @@ -301,7 +284,6 @@ v_Count:=coalesce(v_depreciatedLines, 0) +1; v_BEGINING_DATE:=v_AMORTIZATIONSTARTDATE; v_FIRST_DAY_DATE:=TO_DATE('01-'|| TO_CHAR(v_AMORTIZATIONSTARTDATE, 'MM') || '-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') ; - v_LAST_DAY_DATE:=TO_DATE('31-12-'|| TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') ; if v_Count>1 then v_BEGINING_DATE:=TO_DATE(ADD_MONTHS(LAST_DAY(TO_DATE('01-' || TO_CHAR(v_BEGINING_DATE, 'MM') || '-' || TO_CHAR(v_BEGINING_DATE, 'yyyy'), 'DD-MM-YYYY')), v_DepreciatedLines)) ; v_USELIFEMonths:=v_USELIFEMonths + (1- (to_number(last_day(v_AMORTIZATIONSTARTDATE) - v_AMORTIZATIONSTARTDATE) / @@ -319,11 +301,7 @@ else v_PercentageGeneral:=(((v_AMORTIZATIONVALUEAMT-v_depreciatedPlan) *100/v_AMORTIZATIONVALUEAMT) /(v_USELIFEYEARS-v_DepreciatedLines)) /12; end if; - SELECT to_number(TO_DATE(ADD_MONTHS(v_AMORTIZATIONSTARTDATE, 12*v_USELIFEYEARS)) - TO_DATE(v_AMORTIZATIONSTARTDATE)) - INTO v_TOTAL_DAYS - FROM DUAL; end if; - v_AUXAMT:=0; v_PERCENTAGE:=0; v_TotalAmt:=coalesce(v_DepreciatedPlan, 0) ; finish:=false; diff -r ecd83704f4fc src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml --- a/src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml Thu Dec 14 16:09:23 2017 +0100 @@ -24,7 +24,6 @@ v_message VARCHAR2 (2000) := ''; v_result NUMBER:= 1; -- 0=failure v_record_id varchar2(32); - v_ad_user_id varchar2(32); TYPE RECORD IS REF CURSOR; @@ -45,7 +44,6 @@ ORDER BY p.seqno) LOOP v_record_id := cur_parameter.record_id; - v_ad_user_id := cur_parameter.ad_user_id; IF (cur_parameter.parametername = 'ChangeProjectStatus') THEN diff -r ecd83704f4fc src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml --- a/src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml Thu Dec 14 16:09:23 2017 +0100 @@ -25,7 +25,6 @@ v_Message VARCHAR2(2000):=''; v_Result NUMBER:=1; -- 0=failure v_Record_ID VARCHAR2(32); - v_AD_User_ID VARCHAR2(32); TYPE RECORD IS REF CURSOR; Cur_DebtPaymentBalancing RECORD; v_C_Debt_Payment_ID VARCHAR2(32) ; @@ -44,10 +43,8 @@ v_ResultStr:='PInstanceNotFound'; AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'Y', NULL, NULL) ; BEGIN --BODY - SELECT i.Record_ID, - i.AD_User_ID - INTO v_Record_ID, - v_AD_User_ID + SELECT i.Record_ID + INTO v_Record_ID FROM AD_PINSTANCE i WHERE i.AD_PInstance_ID=p_PInstance_ID; DBMS_OUTPUT.PUT_LINE(' Record_ID=' || v_Record_ID) ; diff -r ecd83704f4fc src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml --- a/src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml Thu Dec 14 16:09:23 2017 +0100 @@ -29,7 +29,6 @@ v_Result NUMBER:=1; -- 0=failure v_Record_ID VARCHAR2(32) ; v_AD_User_ID VARCHAR2(32) ; - v_AD_Client_ID VARCHAR2(32) ; v_AD_Org_ID VARCHAR2(32) ; v_PAD_User_ID VARCHAR2(32) ; v_Processed VARCHAR2(60) ; @@ -97,11 +96,9 @@ END IF; BEGIN --BODY SELECT UpdatedBy, - AD_Client_ID, Processed, Posted, AD_Org_ID, DateAcct, C_DocType_ID INTO v_AD_User_ID, - v_AD_Client_ID, v_processed, v_posted, v_AD_Org_ID, v_Date, v_DocType_ID FROM c_DP_Management diff -r ecd83704f4fc src-db/database/model/functions/C_INVOICELINE_TAX.xml --- a/src-db/database/model/functions/C_INVOICELINE_TAX.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_INVOICELINE_TAX.xml Thu Dec 14 16:09:23 2017 +0100 @@ -20,9 +20,7 @@ * All Rights Reserved. * Contributor(s): _______________________________________. ************************************************************************/ -v_INVOICELINE_ID VARCHAR2(32) ; v_Tax_ID VARCHAR2(32) ; - v_IsTaxIncluded VARCHAR(1); v_LineNet NUMBER; v_Rate NUMBER; xTaxAmt NUMBER:=0; @@ -36,17 +34,14 @@ Cur_MultiTax RECORD; BEGIN --Calculates for each line, its tax info -SELECT l.C_INVOICELINE_ID, +SELECT l.C_Tax_ID, - i.IsTaxIncluded, COALESCE(l.LineNetAmt, 0) + COALESCE(l.ChargeAmt, 0) AS LineNet, t.Rate, t.IsSummary, c.StdPrecision INTO - v_INVOICELINE_ID, v_Tax_ID, - v_IsTaxIncluded, v_LineNet, v_Rate, v_IsSummary, diff -r ecd83704f4fc src-db/database/model/functions/C_INVOICE_CANCEL.xml --- a/src-db/database/model/functions/C_INVOICE_CANCEL.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_INVOICE_CANCEL.xml Thu Dec 14 16:09:23 2017 +0100 @@ -33,7 +33,6 @@ v_ResultStr VARCHAR2(2000):=''; v_Message VARCHAR2(2000):=''; v_Record_ID VARCHAR2(32); - v_AD_Client_ID VARCHAR2(32); -- Parameter TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; @@ -63,7 +62,6 @@ ) LOOP v_Record_ID:=Cur_Parameter.Record_ID; - v_AD_Client_ID:=Cur_Parameter.AD_Client_ID; END LOOP; -- Get Parameter DBMS_OUTPUT.PUT_LINE(' Record_ID=' || v_Record_ID) ; ELSE diff -r ecd83704f4fc src-db/database/model/functions/C_INVOICE_CREATE.xml --- a/src-db/database/model/functions/C_INVOICE_CREATE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_INVOICE_CREATE.xml Thu Dec 14 16:09:23 2017 +0100 @@ -44,7 +44,6 @@ -- Parameter TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; - v_Record_ID VARCHAR2(32):=NULL; v_AD_Org_ID VARCHAR2(32):=NULL; v_C_Order_ID VARCHAR2(32):=NULL; v_BPartner_ID VARCHAR2(32):=NULL; @@ -68,7 +67,6 @@ v_Qty NUMBER; --MODIFIED BY F.IRIAZABAL v_QtyOrder NUMBER; - v_DocSubTypeSO VARCHAR2(60) ; -- v_LineNo NUMBER:=0; v_count NUMBER:=0; @@ -199,7 +197,6 @@ ORDER BY p.SeqNo ) LOOP - v_Record_ID:=Cur_Parameter.Record_ID; v_ADUserId:=Cur_Parameter.AD_User_ID; IF(Cur_Parameter.ParameterName='DateInvoiced') THEN v_DateInvoiced_aux:=Cur_Parameter.P_Date; @@ -401,10 +398,8 @@ -- Get Order DocType Info - approved from Invoice DocType BEGIN v_DocType_ID:=NULL; - v_ResultStr:='GetDocTypeInfo - ' || Cur_Order.C_DocType_ID; SELECT od.C_DocTypeInvoice_ID, - od.DocSubTypeSO - INTO v_DocType_ID, - v_DocSubTypeSO + v_ResultStr:='GetDocTypeInfo - ' || Cur_Order.C_DocType_ID; SELECT od.C_DocTypeInvoice_ID + INTO v_DocType_ID FROM C_DOCTYPE od, C_DOCTYPE ID WHERE od.C_DocType_ID=Cur_Order.C_DocType_ID diff -r ecd83704f4fc src-db/database/model/functions/C_INVOICE_POST.xml --- a/src-db/database/model/functions/C_INVOICE_POST.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_INVOICE_POST.xml Thu Dec 14 16:09:23 2017 +0100 @@ -76,7 +76,6 @@ v_isreturndoctype CHAR(1); v_PaymentRule C_INVOICE.PaymentRule%TYPE; v_PaymentTerm C_INVOICE.C_PaymentTerm_ID%TYPE; - v_Order_ID VARCHAR2(32); v_DateAcct DATE; v_DateInvoiced DATE; v_DocumentNo C_INVOICE.DocumentNo%TYPE; @@ -121,7 +120,6 @@ v_REInOutStatus M_INOUT.DocStatus%TYPE; v_REDateInvoiced DATE; v_REtotalQtyInvoiced NUMBER:=0; - v_REdeliveredQty NUMBER:=0; -- v_CumDiscount NUMBER; v_OldCumDiscount NUMBER; @@ -259,14 +257,14 @@ i.C_DocType_ID, i.C_DocTypeTarget_ID, i.PaymentRule, i.C_PaymentTerm_ID, i.DateAcct, i.DateInvoiced, i.AD_Client_ID, i.AD_Org_ID, i.UpdatedBy, i.DocumentNo, - i.C_Order_ID, i.IsSOTrx, i.C_BPartner_ID, i.AD_User_ID, + i.IsSOTrx, i.C_BPartner_ID, i.AD_User_ID, i.C_Currency_ID, i.POReference, i.Posted, i.c_Project_Id, i.C_WithHolding_ID, i.IsCashVat, i.prepaymentamt INTO v_Processing, v_Processed, v_DocAction, v_DocStatus, v_DocType_ID, v_DocTypeTarget_ID, v_PaymentRule, v_PaymentTerm, v_DateAcct, v_DateInvoiced, v_Client_ID, v_Org_ID, v_UpdatedBy, v_DocumentNo, - v_Order_ID, v_IsSOTrx, v_BPartner_ID, v_BPartner_User_ID, + v_IsSOTrx, v_BPartner_ID, v_BPartner_User_ID, v_Currency_ID, v_POReference, v_Posted, v_C_Project_Id, cWithHoldID, v_iscashvat, v_prepaymentamt FROM C_INVOICE i @@ -1004,9 +1002,6 @@ AND C_INVOICE.Processed='Y' AND C_INVOICELINE.M_InOutLine_ID=Cur_ReactivateInvoiceLine.M_InOutLine_ID; v_REtotalQtyInvoiced:=v_REtotalQtyInvoiced - Cur_ReactivateInvoiceLine.QtyInvoiced; - SELECT MovementQty INTO v_REdeliveredQty - FROM M_INOUTLINE - WHERE M_InOutLine_ID=Cur_ReactivateInvoiceLine.M_InOutLine_ID; UPDATE M_INOUTLINE SET IsInvoiced=( CASE v_REtotalQtyInvoiced @@ -1462,7 +1457,6 @@ v_totalQtyInvoiced NUMBER; v_ODocumentNo C_ORDER.DocumentNo%TYPE; v_NewPendingToInvoice NUMBER; - v_deliveredQty NUMBER; v_inOutStatus varchar2(60) ; BEGIN SELECT DateInvoiced @@ -1506,9 +1500,6 @@ AND C_INVOICE.Processed='Y' AND C_INVOICELINE.M_InOutLine_ID=CurLines.M_InOutLine_ID; v_totalQtyInvoiced:=v_totalQtyInvoiced + CurLines.QtyInvoiced; - SELECT MovementQty INTO v_deliveredQty - FROM M_INOUTLINE - WHERE M_InOutLine_ID=CurLines.M_InOutLine_ID; UPDATE M_INOUTLINE SET IsInvoiced=( CASE v_totalQtyInvoiced diff -r ecd83704f4fc src-db/database/model/functions/C_ORDER_POST1.xml --- a/src-db/database/model/functions/C_ORDER_POST1.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_ORDER_POST1.xml Thu Dec 14 16:09:23 2017 +0100 @@ -86,7 +86,6 @@ v_ISO_Code VARCHAR(10) ; v_DocumentNo VARCHAR2(200) ; v_GrandTotal NUMBER; - v_Multiplier NUMBER:=1; v_Date DATE; v_WarehouseName VARCHAR2(60) ; v_count NUMBER; @@ -1739,19 +1738,6 @@ /************************************************************************** * Credit Multiplier *************************************************************************/ - DECLARE - v_DocBaseType C_DOCTYPE.DocBaseType%TYPE; - BEGIN - -- Is it a Credit Memo? - SELECT DocBaseType - INTO v_DocBaseType - FROM C_DOCTYPE - WHERE C_DocType_ID=v_DocType_ID; - IF (v_DocBaseType IN('ARC', 'API')) THEN - v_Multiplier:=-1; - END IF; - END; - IF (v_Cash_ID IS NULL) THEN v_ResultStr:='Create C_Cash'; Ad_Sequence_Next('C_Cash', v_Org_ID, v_Cash_ID) ; diff -r ecd83704f4fc src-db/database/model/functions/C_SETTLEMENT_POST.xml --- a/src-db/database/model/functions/C_SETTLEMENT_POST.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_SETTLEMENT_POST.xml Thu Dec 14 16:09:24 2017 +0100 @@ -33,7 +33,6 @@ v_AD_Client_ID VARCHAR2(32) ; v_AD_Org_ID VARCHAR2(32) ; v_Processed VARCHAR(60) ; - v_Type VARCHAR(60); v_Currency VARCHAR2(32); v_Date DATE; v_DateAcct DATE; @@ -72,7 +71,6 @@ -- For WithHolding v_CanceledNotChargeAmt_WH NUMBER:=0; v_GeneratedAmt_WH NUMBER:=0; - v_ChargedAmt_WH NUMBER:=0; -- FINISH_PROCESS BOOLEAN:=false; BEGIN @@ -107,11 +105,9 @@ END IF; BEGIN --BODY SELECT UpdatedBy, AD_Client_ID, AD_Org_ID, Processed, - C_Currency_ID, DATETRX, DateAcct, IsGenerated, C_DocType_ID, - settlementtype + C_Currency_ID, DATETRX, DateAcct, IsGenerated, C_DocType_ID INTO v_AD_User_ID, v_AD_Client_ID, v_AD_Org_ID, v_Processed, - v_Currency, v_Date, v_DateAcct, v_IsGenerated, v_DocType_ID, - v_Type + v_Currency, v_Date, v_DateAcct, v_IsGenerated, v_DocType_ID FROM C_SETTLEMENT WHERE C_Settlement_ID=v_Record_ID; IF(v_PAD_User_ID IS NOT NULL) THEN @@ -400,9 +396,8 @@ AND isActive='Y' AND isManual='N'; --Calculating the applied amount - SELECT COALESCE(SUM(C_Currency_Round( C_Currency_Convert((Amount - WriteOffAmt), C_Currency_ID, v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0), - COALESCE(SUM(C_Currency_Round( C_Currency_Convert((coalesce(WithHoldingAmount,0) ), C_Currency_ID, v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0) - INTO v_ChargedAmt,v_ChargedAmt_WH + SELECT COALESCE(SUM(C_Currency_Round( C_Currency_Convert((Amount - WriteOffAmt), C_Currency_ID, v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0) + INTO v_ChargedAmt FROM C_Debt_Payment_V WHERE(C_Settlement_Cancel_ID=v_Record_ID OR C_Settlement_Generate_ID=v_Record_ID) diff -r ecd83704f4fc src-db/database/model/functions/C_TAXPAYMENT_POST.xml --- a/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Thu Dec 14 16:09:24 2017 +0100 @@ -88,7 +88,6 @@ v_TRTcountN NUMBER; v_dummy VARCHAR2(2000); v_count NUMBER:=0; -v_FIN_PAYMENT_ID VARCHAR2(32); BEGIN -- Update AD_PInstance @@ -167,8 +166,8 @@ if v_processed='Y' then begin - select tp.gl_journal_id , gljb.gl_journalbatch_id, tp.c_settlement_id, tp.fin_payment_id - into v_gl_journalid, v_gl_journalbatchid, v_settlementid, v_FIN_PAYMENT_ID + select tp.gl_journal_id , gljb.gl_journalbatch_id, tp.c_settlement_id + into v_gl_journalid, v_gl_journalbatchid, v_settlementid from c_taxpayment tp inner join gl_journal glj on tp.gl_journal_id=glj.gl_journal_id inner join gl_journalbatch gljb on gljb.gl_journalbatch_id=glj.gl_journalbatch_id diff -r ecd83704f4fc src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml --- a/src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml Thu Dec 14 16:09:24 2017 +0100 @@ -43,8 +43,6 @@ v_New_SubAccount_No VARCHAR(32) :=null; v_Default_Account_No VARCHAR(32) :=null; v_Seq_No_For_Subaccount_No VARCHAR(32) :=null; - v_Default_Account_Name VARCHAR(60) :=null; - v_Default_Account_Desc CHARACTER VARYING(255); v_Default_Account_Client_ID VARCHAR(32); v_Org_ID VARCHAR(32); v_C_AcctSchema_ID VARCHAR(32) :=null; @@ -64,16 +62,12 @@ */ SELECT C_ElementValue.Value, - C_ElementValue.Name, - C_ElementValue.Description, C_ElementValue.AD_Client_ID, C_ElementValue.C_ElementValue_ID, C_ValidCombination.C_AcctSchema_ID, C_ElementValue.AD_Org_ID INTO v_Default_Account_No, - v_Default_Account_Name, - v_Default_Account_Desc, v_Default_Account_Client_ID, v_Node_ID, v_C_AcctSchema_ID, diff -r ecd83704f4fc src-db/database/model/functions/FACT_ACCT_RESET.xml --- a/src-db/database/model/functions/FACT_ACCT_RESET.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/FACT_ACCT_RESET.xml Thu Dec 14 16:09:24 2017 +0100 @@ -37,8 +37,6 @@ v_Message VARCHAR2(2000):=''; v_Result NUMBER:=1; -- 0=failure v_Record_ID VARCHAR2(32); - v_AD_User_ID VARCHAR2(32); - v_DateColumn VARCHAR2(2000):=''; v_AD_Org_ID VARCHAR2(32); v_TableName VARCHAR2(48):=''; v_AD_Org_CalOwner VARCHAR(32); @@ -86,7 +84,6 @@ ) LOOP v_Record_ID:=Cur_Parameter.Record_ID; - v_AD_User_ID:=Cur_Parameter.AD_User_ID; IF(Cur_Parameter.ParameterName='AD_Client_ID') THEN v_AD_Client_ID:=Cur_Parameter.P_String; DBMS_OUTPUT.PUT_LINE(' AD_Client_ID=' || v_AD_Client_ID) ; @@ -270,15 +267,6 @@ AND AD_Client_ID = Cur_Clients.AD_Client_ID ) LOOP IF (v_DeleteFact='Y') THEN - IF(Cur_Tables.AD_Table_ID IN('472', '473')) THEN - v_DateColumn:='DATETRX'; - ELSIF(Cur_Tables.AD_Table_ID IN('392')) THEN - v_DateColumn:='STATEMENTDATE'; - ELSIF(Cur_Tables.AD_Table_ID IN('321', '323', '325')) THEN - v_DateColumn:='MOVEMENTDATE'; - ELSE - v_DateColumn:='DATEACCT'; - END IF; v_Cmd:='UPDATE ' || Cur_Tables.TableName || ' SET Posted=''N'', Processing=''N'' WHERE AD_Client_ID=''' || Cur_Clients.AD_Client_ID || ''' AND (Posted<>''N'' OR Posted IS NULL OR Processing<>''N'' OR Processing IS NULL) AND ' || Cur_Tables.TableName||'_ID = '''||Cur_Fact_Acct.Record_ID||''''; diff -r ecd83704f4fc src-db/database/model/functions/GL_JOURNAL_POST.xml --- a/src-db/database/model/functions/GL_JOURNAL_POST.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/GL_JOURNAL_POST.xml Thu Dec 14 16:09:24 2017 +0100 @@ -43,7 +43,6 @@ v_AD_Org_ID VARCHAR2(32); v_C_Period_ID VARCHAR2(32); v_DateAcct DATE; - v_DocType_ID VARCHAR2(32); v_BatchOrg_ID VARCHAR2(32); -- Parameter TYPE RECORD IS REF CURSOR; @@ -106,12 +105,12 @@ SELECT DocStatus, DocAction, Processing, - Posted, AD_Org_ID, DateAcct, C_DocType_ID, + Posted, AD_Org_ID, DateAcct, C_Period_ID INTO v_DocStatus, v_DocAction, v_Processing, - v_Posted, v_AD_Org_ID, v_DateAcct, v_DocType_ID, + v_Posted, v_AD_Org_ID, v_DateAcct, v_C_Period_ID FROM GL_Journal WHERE GL_Journal_ID=v_Record_ID FOR UPDATE; diff -r ecd83704f4fc src-db/database/model/functions/MA_PRODUCTION_COST.xml --- a/src-db/database/model/functions/MA_PRODUCTION_COST.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/MA_PRODUCTION_COST.xml Thu Dec 14 16:09:24 2017 +0100 @@ -32,8 +32,6 @@ -- Parameter TYPE RECORD IS REF CURSOR; - v_Org_ID varchar2(32); - v_Client_ID varchar2(32); v_count NUMBER; v_countAux NUMBER; v_count2 NUMBER; @@ -102,8 +100,8 @@ IF (v_count > 0) THEN -- Costing engine migrated - SELECT MAX(pr.ad_client_id), MAX(pr.ad_org_id), MAX(pr.movementdate), MAX(trxprocessdate), COUNT (*), MAX(pr.DOCUMENTNO) - INTO v_Client_ID, v_Org_ID, v_ProductionDate, v_CostingDate, v_count, v_ProductionNo + SELECT MAX(pr.movementdate), MAX(trxprocessdate), COUNT (*), MAX(pr.DOCUMENTNO) + INTO v_ProductionDate, v_CostingDate, v_count, v_ProductionNo FROM M_PRODUCTION pr, M_PRODUCTIONLINE pl LEFT JOIN M_TRANSACTION t ON t.m_productionline_id = pl.m_productionline_id , M_PRODUCTIONPLAN pp @@ -113,8 +111,8 @@ v_costingdate := COALESCE(v_costingdate, v_productiondate); ELSE -- Costing engine not migrated - SELECT MAX(pr.ad_client_id), MAX(pr.ad_org_id), MAX(movementdate), MAX(movementdate), COUNT (*), MAX(pr.DOCUMENTNO) - INTO v_Client_ID, v_Org_ID, v_ProductionDate, v_CostingDate, v_count, v_ProductionNo + SELECT MAX(movementdate), MAX(movementdate), COUNT (*), MAX(pr.DOCUMENTNO) + INTO v_ProductionDate, v_CostingDate, v_count, v_ProductionNo FROM M_PRODUCTION pr, M_PRODUCTIONLINE pl, M_PRODUCTIONPLAN pp WHERE pr.m_production_id = p_Production_ID AND pr.m_production_id = pp.m_production_id diff -r ecd83704f4fc src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml --- a/src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml Thu Dec 14 16:09:24 2017 +0100 @@ -38,7 +38,6 @@ v_ResultStr VARCHAR2(2000) := ''; v_CostCenterUse NUMBER; - v_Multiplier NUMBER; v_Outsourced CHAR(1); v_OutsourcingCost NUMBER; v_CostCenter_Version varchar2(32); @@ -72,7 +71,7 @@ DELETE FROM MA_SEQUENCE_EMPLOYEE WHERE MA_SEQUENCE_ID = p_Sequence_ID; DELETE FROM MA_SEQUENCE_MACHINE WHERE MA_SEQUENCE_ID = p_Sequence_ID; - SELECT s.CostCenterUse, s.Multiplier, s.outsourced, s.outsourcingcost, ccv.MA_CostCenter_Version_ID, s.MA_ProcessPlan_Version_ID, + SELECT s.CostCenterUse, s.outsourced, s.outsourcingcost, ccv.MA_CostCenter_Version_ID, s.MA_ProcessPlan_Version_ID, SUM(CASE sp.productiontype WHEN '+' THEN (pd.weight*sp.quantity*COALESCE(sp.decrease,1)*COALESCE(sp.rejected,1)) ELSE 0 END), SUM(CASE sp.productiontype WHEN '+' THEN (sp.quantity*COALESCE(sp.decrease,1)*COALESCE(sp.rejected,1)) @@ -80,7 +79,7 @@ SUM(CASE sp.productiontype WHEN '+' THEN (CASE WHEN sp.quantity <> 0 THEN COALESCE(sp.ComponentCost,1) ELSE 0 END ) ELSE 0 END) - INTO v_CostCenterUse, v_Multiplier, v_Outsourced, v_OutsourcingCost, v_CostCenter_Version, v_ProcessPlan_Version, + INTO v_CostCenterUse, v_Outsourced, v_OutsourcingCost, v_CostCenter_Version, v_ProcessPlan_Version, v_ProducedKG, v_ProducedUd, v_CompCostSum FROM MA_Sequence s, MA_SequenceProduct sp, M_Product pd, MA_Process p LEFT JOIN (SELECT MA_CostCenter_ID, MA_CostCenter_version_ID diff -r ecd83704f4fc src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml --- a/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml Thu Dec 14 16:09:24 2017 +0100 @@ -34,19 +34,7 @@ v_Org_ID VARCHAR2(32); v_Client_ID VARCHAR2(32); v_count NUMBER; --- v_count2 NUMBER; --- v_Production_ID VARCHAR2(32); v_ProductionDate DATE; --- v_Name NVARCHAR2(60) ; - -- p_ppline NUMBER; - -- p_plline NUMBER; --- v_ProductionPlan_ID VARCHAR2(32); --- v_ProductionLine_ID VARCHAR2(32); --- v_Quantity NUMBER; --- v_UOM_ID VARCHAR2(32); --- v_PInstance NUMBER; --- v_doneQty NUMBER; --- v_needQty NUMBER; v_QtyOnHand NUMBER; p_Processed CHAR; v_ProductQty NUMBER; diff -r ecd83704f4fc src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml --- a/src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml Thu Dec 14 16:09:25 2017 +0100 @@ -31,7 +31,6 @@ -- Phases to close Cur_Phase RECORD; -- - v_Client_ID VARCHAR2(32); BEGIN -- Process Parameters IF(p_PInstance_ID IS NOT NULL) THEN @@ -57,7 +56,6 @@ ORDER BY p.SeqNo ) LOOP - v_Client_ID:=Cur_Parameter.AD_Client_ID; v_Record_ID:=Cur_Parameter.Record_ID; END LOOP; -- Get Parameter ELSE diff -r ecd83704f4fc src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml --- a/src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml Thu Dec 14 16:09:25 2017 +0100 @@ -43,7 +43,6 @@ v_Processed CHAR; v_LaunchDate DATE; v_Startdate DATE; - v_Enddate DATE; -- WRPhases to process Cur_WRPhase RECORD; -- Sequence Products to process @@ -92,16 +91,14 @@ ExplodePhases, LaunchDate, AD_Org_ID, - Startdate, - Enddate + Startdate INTO v_ProcessPlan_ID, v_Quantity, v_Processed, v_ExplodePhases, v_LaunchDate, v_Org_ID, - v_Startdate, - v_Enddate + v_Startdate FROM MA_WorkRequirement WHERE MA_WorkRequirement_ID=v_Record_ID; --Check if it hasn't already been processed diff -r ecd83704f4fc src-db/database/model/functions/MA_WRPHASE_CLOSE.xml --- a/src-db/database/model/functions/MA_WRPHASE_CLOSE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/MA_WRPHASE_CLOSE.xml Thu Dec 14 16:09:25 2017 +0100 @@ -33,7 +33,6 @@ v_Record_ID VARCHAR2(32):=NULL; v_WorkRequirement_ID VARCHAR2(32); v_Count NUMBER; - v_Client_ID VARCHAR2(32); BEGIN -- Process Parameters IF(p_PInstance_ID IS NOT NULL) THEN @@ -60,7 +59,6 @@ ) LOOP v_Record_ID:=Cur_Parameter.Record_ID; - v_Client_ID:=Cur_Parameter.AD_Client_ID; END LOOP; -- Get Parameter ELSE DBMS_OUTPUT.PUT_LINE('--<>') ; diff -r ecd83704f4fc src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml --- a/src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml Thu Dec 14 16:09:25 2017 +0100 @@ -34,7 +34,6 @@ v_Message VARCHAR2(2000):=''; v_Result NUMBER:=1; -- 0=failure v_Record_ID VARCHAR2(32); - v_AD_User_ID VARCHAR2(32); -- Parameter TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; @@ -65,7 +64,6 @@ ) LOOP v_Record_ID:=Cur_Parameter.Record_ID; - v_AD_User_ID:=Cur_Parameter.AD_User_ID; END LOOP; -- Get Parameter DBMS_OUTPUT.PUT_LINE(' Record_ID=' || v_Record_ID) ; -- Line diff -r ecd83704f4fc src-db/database/model/functions/M_FREIGHT_CALCULATE.xml --- a/src-db/database/model/functions/M_FREIGHT_CALCULATE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_FREIGHT_CALCULATE.xml Thu Dec 14 16:09:25 2017 +0100 @@ -31,8 +31,6 @@ TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; -- Record Info - v_Client_ID VARCHAR2(32); - v_Org_ID VARCHAR2(32); v_User_ID VARCHAR2(32); v_Shipper_ID VARCHAR2(32); v_FreightCategory_ID VARCHAR2(32); @@ -73,8 +71,6 @@ LOOP v_Record_ID:=Cur_Parameter.Record_ID; v_User_ID:=Cur_Parameter.AD_User_ID; - v_Org_ID:=Cur_Parameter.AD_Org_ID; - v_Client_ID:=Cur_Parameter.AD_Client_ID; IF(Cur_Parameter.ParameterName='cheaper') THEN v_Cheaper:=Cur_Parameter.P_String; DBMS_OUTPUT.PUT_LINE(' Cheaper=' || v_Cheaper) ; diff -r ecd83704f4fc src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml --- a/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml Thu Dec 14 16:09:25 2017 +0100 @@ -25,7 +25,6 @@ v_Result NUMBER:=1; v_Message VARCHAR2(2000):=''; v_MessageCount NUMBER:=0; - v_Record_ID VARCHAR2(32); v_Date DATE; v_Qty NUMBER; v_Cost NUMBER; @@ -93,7 +92,6 @@ ORDER BY p.SeqNo ) LOOP - v_Record_ID:=Cur_Parameter.Record_ID; v_User:=Cur_Parameter.AD_User_ID; v_Client:=Cur_Parameter.AD_Client_ID; IF (Cur_Parameter.ParameterName = 'IsIncremental') THEN diff -r ecd83704f4fc src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml --- a/src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml Thu Dec 14 16:09:25 2017 +0100 @@ -29,7 +29,6 @@ -- Logistice v_ResultStr VARCHAR2(2000):=''; v_Message VARCHAR2(2000):=''; - v_Record_ID VARCHAR2(32); v_User VARCHAR2(32); v_Deleted NUMBER; -- Parameter @@ -59,7 +58,6 @@ ORDER BY p.SeqNo ) LOOP - v_Record_ID:=Cur_Parameter.Record_ID; v_User:=Cur_Parameter.AD_User_ID; END LOOP; -- Get Parameter DELETE diff -r ecd83704f4fc src-db/database/model/functions/M_GET_STOCK_PARAM.xml --- a/src-db/database/model/functions/M_GET_STOCK_PARAM.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_GET_STOCK_PARAM.xml Thu Dec 14 16:09:26 2017 +0100 @@ -422,7 +422,6 @@ v_availableqty NUMBER; v_AuxResult NUMBER; v_AuxMessage VARCHAR2(2000):=''; - v_productname M_PRODUCT.NAME%TYPE; v_parameters VARCHAR2(2000); BEGIN SELECT SUM(quantity) INTO v_availableqty @@ -600,9 +599,6 @@ WHERE ad_pinstance_id = p_uuid; IF (v_totalqty < v_quantity AND v_availableqty >= v_quantity) THEN IF (v_message IS NULL OR v_message = '') THEN - SELECT name INTO v_productname - FROM m_product - WHERE m_product_id = v_productid; v_message := '@NotEnoughStockedDueWHRule@'; END IF; DBMS_OUTPUT.PUT_LINE( v_message); --OBTG:-20000-- diff -r ecd83704f4fc src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml --- a/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml Thu Dec 14 16:09:26 2017 +0100 @@ -25,8 +25,6 @@ ************************************************************************/ -- Logistice v_explode CHAR(1); - v_inoutID VARCHAR2(32); - v_CBPartner_ID VARCHAR2(32); v_Record_ID VARCHAR2(32); TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; @@ -65,8 +63,8 @@ DBMS_OUTPUT.PUT_LINE(' Record_ID=' || v_Record_ID) ; BEGIN --BODY - SELECT M_INOUT.m_inout_id, M_INOUT.c_bpartner_id, m_inoutline.explode - INTO v_inoutID, v_CBPartner_ID, v_explode + SELECT m_inoutline.explode + INTO v_explode FROM M_INOUT JOIN m_inoutline ON M_INOUT.m_inout_id = m_inoutline.m_inout_id WHERE m_inoutline.m_inoutline_id=v_Record_ID FOR UPDATE; diff -r ecd83704f4fc src-db/database/model/functions/M_INOUT_CREATE.xml --- a/src-db/database/model/functions/M_INOUT_CREATE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_INOUT_CREATE.xml Thu Dec 14 16:09:26 2017 +0100 @@ -432,7 +432,6 @@ v_UOM_old varchar2(32); v_Attribute_old varchar2(32); v_Product_UOM_old varchar2(32); - v_orderline_old varchar2(32); v_QtyStorage NUMBER:=0; v_LocatorQty NUMBER; v_IsStocked NUMBER:=0; @@ -484,7 +483,6 @@ v_UOM_old := ol.C_UOM_ID; v_Attribute_old := ol.M_AttributeSetInstance_ID; v_Product_UOM_old := ol.M_Product_UOM_ID; - v_orderline_old := ol.c_orderline_id; IF (Cur_Storage_ISOPEN) THEN CLOSE Cur_Storage; Cur_Storage_ISOPEN:=false; diff -r ecd83704f4fc src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml --- a/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml Thu Dec 14 16:09:26 2017 +0100 @@ -108,7 +108,6 @@ v_line_gross_amount NUMBER:=0; v_grosspricestd NUMBER:=0; v_grosspricelist NUMBER:=0; - v_priceprecision NUMBER; v_stdprecision NUMBER; -- v_taxBaseAmt NUMBER; @@ -209,8 +208,8 @@ WHERE c_bpartner_id = CUR_Shipment.C_BPartner_ID; END IF; - SELECT PricePrecision, stdprecision - INTO v_priceprecision, v_stdprecision + SELECT stdprecision + INTO v_stdprecision FROM C_CURRENCY WHERE C_CURRENCY_ID = v_C_Currency_ID; diff -r ecd83704f4fc src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml --- a/src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml Thu Dec 14 16:09:26 2017 +0100 @@ -23,10 +23,6 @@ v_ResultStr VARCHAR2(2000):=''; v_Message VARCHAR2(2000):=''; v_Record_ID VARCHAR2(32); - v_Result NUMBER:=0; -- failure - v_AD_User_ID VARCHAR2(32); - v_AD_Org_ID VARCHAR2(32); - v_AD_Client_ID VARCHAR2(32); -- Parameter TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; @@ -59,9 +55,6 @@ ) LOOP v_Record_ID:=Cur_Parameter.Record_ID; - v_AD_User_ID:=Cur_Parameter.AD_User_ID; - v_AD_Org_ID:=Cur_Parameter.AD_Org_ID; - v_AD_Client_ID:=Cur_Parameter.AD_Client_ID; IF(Cur_Parameter.ParameterName='M_InOut_ID') THEN v_M_InOut_ID:=Cur_Parameter.P_String; DBMS_OUTPUT.PUT_LINE(' M_InOut_ID=' || v_M_InOut_ID) ; @@ -106,7 +99,6 @@ A; IF(v_Total>0) THEN v_Message:='LinesNotMatch'; - v_Result:=0; FINISH_PROCESS:=true; END IF; IF(NOT FINISH_PROCESS) THEN diff -r ecd83704f4fc src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml --- a/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml Thu Dec 14 16:09:26 2017 +0100 @@ -44,7 +44,6 @@ v_qty_From NUMBER; v_qty_To NUMBER; v_apply_next VARCHAR(1); - v_tax VARCHAR(32); v_qty NUMBER; v_unitPrice NUMBER; v_newUnitPrice NUMBER; @@ -68,16 +67,16 @@ where m_offer_id = p_rule_id; if (p_type ='O') then - select gross_unit_price, c_tax_id, qtyordered, priceactual, + select gross_unit_price, qtyordered, priceactual, line_gross_amount, linenetamt - into v_unitprice, v_tax, v_qty, v_priceactual, + into v_unitprice, v_qty, v_priceactual, v_origGrossAmt, v_origLineNetAmt from c_orderline where c_orderline_id = p_line_id; else - select gross_unit_price, c_tax_id, qtyinvoiced, priceactual, + select gross_unit_price, qtyinvoiced, priceactual, line_gross_amount, linenetamt - into v_unitprice, v_tax, v_qty, v_priceactual, + into v_unitprice, v_qty, v_priceactual, v_origGrossAmt, v_origLineNetAmt from c_invoiceline where c_invoiceline_id = p_line_id; diff -r ecd83704f4fc src-db/database/model/functions/M_REQUISITION_CREATEPO.xml --- a/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml Thu Dec 14 16:09:26 2017 +0100 @@ -52,7 +52,6 @@ v_line_gross_amount NUMBER; v_lineNetAmt NUMBER; v_stdPre NUMBER; - v_priPre NUMBER; v_Gross NUMBER; v_Description C_OrderLine.Description%TYPE; @@ -257,7 +256,7 @@ END IF; - SELECT STDPRECISION, PRICEPRECISION INTO v_stdPre, v_priPre FROM C_CURRENCY WHERE C_CURRENCY_ID = v_Currency_ID; + SELECT STDPRECISION INTO v_stdPre FROM C_CURRENCY WHERE C_CURRENCY_ID = v_Currency_ID; v_ResultStr:='Insert order line'; IF (Cur_Lines.istaxincluded = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml --- a/src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml Thu Dec 14 16:09:26 2017 +0100 @@ -87,13 +87,11 @@ Cur_MStock RECORD; v_quantity NUMBER; - v_ProductID VARCHAR2(32); v_SelectedLocatorID VARCHAR2(32) ; BEGIN v_ResultStr:='ReadingParameters'; v_Quantity:=p_quantity; - v_ProductID:=p_productid; FOR Cur_MStock IN ( SELECT sum(ms.quantity) AS qty, t.m_locator_id, MIN(priority) AS priority diff -r ecd83704f4fc src-db/database/model/triggers/A_ASSET_TRG.xml --- a/src-db/database/model/triggers/A_ASSET_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/A_ASSET_TRG.xml Thu Dec 14 16:09:27 2017 +0100 @@ -20,7 +20,6 @@ ************************************************************************/ TYPE RECORD IS REF CURSOR; - v_Acct_ID VARCHAR2(32); Cur_Defaults RECORD; v_AttrSetValueType M_Product.AttrSetValueType%TYPE; v_xTree_ID AD_ClientInfo.AD_Tree_Asset_ID%TYPE; @@ -48,7 +47,6 @@ AND d1.AD_CLIENT_ID = :new.AD_Client_ID ) LOOP - Ad_Sequence_Next('A_Asset_Acct', Cur_Defaults.AD_Client_ID, v_Acct_ID) ; INSERT INTO A_ASSET_ACCT ( diff -r ecd83704f4fc src-db/database/model/triggers/C_ATTACHMENT_METHOD_MOD_TRG.xml --- a/src-db/database/model/triggers/C_ATTACHMENT_METHOD_MOD_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_ATTACHMENT_METHOD_MOD_TRG.xml Thu Dec 14 16:09:27 2017 +0100 @@ -21,7 +21,6 @@ ************************************************************************/ devTemplate NUMBER; devModule CHAR(1); - currentID VARCHAR2(32); currentModuleID VARCHAR2(32); vAux NUMBER; @@ -52,10 +51,8 @@ END IF; IF (UPDATING OR INSERTING) THEN - currentID := :new.C_Attachment_Method_ID; currentModuleID := :new.AD_Module_ID; ELSE - currentID := :old.C_Attachment_Method_ID; currentModuleID := :old.AD_Module_ID; END IF; diff -r ecd83704f4fc src-db/database/model/triggers/C_BPARTNER_TRG.xml --- a/src-db/database/model/triggers/C_BPARTNER_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_BPARTNER_TRG.xml Thu Dec 14 16:09:27 2017 +0100 @@ -44,7 +44,6 @@ v_E_Prepayment_Acct varchar2(32); v_seq_name varchar2(32); v_Sequence_No varchar2(32); - v_C_AcctSchema_ID VARCHAR2(32); v_count NUMBER; v_currency_pl VARCHAR2(32); v_currency_credit VARCHAR2(32); @@ -57,7 +56,6 @@ -- Default Accounts for all AcctSchema IF (INSERTING) THEN - v_C_AcctSchema_ID:=null; FOR Cur_Defaults IN ( SELECT AD_IsOrgIncluded(:new.AD_Org_ID, a.AD_Org_ID, :new.AD_Client_ID), AD_IsOrgIncluded(a.AD_Org_ID, :new.AD_Org_ID, :new.AD_Client_ID), @@ -188,7 +186,6 @@ END IF; END LOOP; -- Employee - v_C_AcctSchema_ID:=null; v_count:=0; FOR Cur_Defaults2 IN ( SELECT AD_IsOrgIncluded(:new.AD_Org_ID, oa.AD_Org_ID, :new.AD_Client_ID), AD_IsOrgIncluded(oa.AD_Org_ID, :new.AD_Org_ID, :new.AD_Client_ID), @@ -254,7 +251,6 @@ Cur_Defaults2.E_Expense_Acct, Cur_Defaults2.E_Prepayment_Acct); END IF; - v_C_AcctSchema_ID:=Cur_Defaults2.C_AcctSchema_ID; END IF; END LOOP; diff -r ecd83704f4fc src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml --- a/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml Thu Dec 14 16:09:27 2017 +0100 @@ -27,7 +27,6 @@ v_C_INVOICE_ID VARCHAR2(32) ; v_Prec NUMBER:=2; v_Currency VARCHAR2(32); - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); v_Issotrx CHAR(1); @@ -119,7 +118,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/C_INVOICELINE_TRG.xml --- a/src-db/database/model/triggers/C_INVOICELINE_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_INVOICELINE_TRG.xml Thu Dec 14 16:09:27 2017 +0100 @@ -22,7 +22,6 @@ - v_ID varchar2(32); v_UOM_ID varchar2(32); v_AttrSetValueType M_Product.AttrSetValueType%TYPE; v_count NUMBER; @@ -69,9 +68,6 @@ END IF; END IF; END IF; - v_ID := :NEW.C_Invoice_ID; - ELSE - v_ID := :OLD.C_Invoice_ID; END IF; IF (INSERTING OR UPDATING) THEN --Does not allow to change the attribute set value diff -r ecd83704f4fc src-db/database/model/triggers/C_INVOICELINE_TRG2.xml --- a/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml Thu Dec 14 16:09:27 2017 +0100 @@ -29,7 +29,6 @@ v_taxBaseAmt C_INVOICETAX.TAXBASEAMT%TYPE; v_taxAmt C_INVOICETAX.TAXAMT%TYPE; v_Prec C_CURRENCY.STDPRECISION%TYPE; - v_PricePrec C_CURRENCY.PRICEPRECISION%TYPE; v_DocTaxAmount C_TAX.DocTaxAmount%TYPE; v_istaxincluded CHAR(1) ; @@ -83,8 +82,8 @@ /************************************************************************** * Calculate Tax, etc. */ - SELECT processed, stdPrecision, priceprecision, pl.istaxincluded, C_BPARTNER_LOCATION_ID, C_PROJECT_ID, ISSOTRX - INTO v_Processed, v_Prec, v_PricePrec, v_istaxincluded, v_Bpartner_Location_ID, v_Project_ID, v_IsSOTRX + SELECT processed, stdPrecision, pl.istaxincluded, C_BPARTNER_LOCATION_ID, C_PROJECT_ID, ISSOTRX + INTO v_Processed, v_Prec, v_istaxincluded, v_Bpartner_Location_ID, v_Project_ID, v_IsSOTRX FROM C_Invoice, C_Currency, m_pricelist pl WHERE C_Invoice.C_Currency_ID = C_Currency.C_Currency_ID AND C_Invoice.m_pricelist_id = pl.m_pricelist_id diff -r ecd83704f4fc src-db/database/model/triggers/C_ORDERLINE2_TRG.xml --- a/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml Thu Dec 14 16:09:27 2017 +0100 @@ -27,7 +27,6 @@ v_QtyOrderReserved NUMBER; V_STOCKED NUMBER; v_DocStatus VARCHAR(60); - v_DocAction VARCHAR(60); v_isSOTrx CHAR(1); v_QtyReservedPO NUMBER; v_QtyOrderReservedPO NUMBER; @@ -101,8 +100,8 @@ IF(UPDATING OR DELETING) THEN v_ID:=:old.C_Order_ID; - SELECT DocStatus, DocAction, isSOTrx - INTO v_DocStatus, v_DocAction, v_isSOTrx + SELECT DocStatus, isSOTrx + INTO v_DocStatus, v_isSOTrx FROM c_Order WHERE c_order_id = v_ID; IF(v_DocStatus = 'IP') THEN @@ -131,8 +130,8 @@ IF(INSERTING OR UPDATING) THEN v_ID:=:new.C_Order_ID; - SELECT DocStatus, DocAction, isSOTrx - INTO v_DocStatus, v_DocAction, v_isSOTrx + SELECT DocStatus, isSOTrx + INTO v_DocStatus, v_isSOTrx FROM c_Order WHERE c_order_id = v_ID; IF(v_DocStatus = 'IP') THEN diff -r ecd83704f4fc src-db/database/model/triggers/C_ORDERLINE_TRG2.xml --- a/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml Thu Dec 14 16:09:28 2017 +0100 @@ -25,7 +25,6 @@ ************************************************************************/ v_istaxincluded CHAR(1) ; - v_Processed C_ORDER.PROCESSED%TYPE; v_ID C_ORDERLINE.C_ORDER_ID%TYPE; v_oldLine NUMBER; v_newLineNetAmt NUMBER; @@ -35,7 +34,6 @@ v_taxBaseAmt C_ORDERTAX.TAXBASEAMT%TYPE; v_taxAmt C_ORDERTAX.TAXAMT%TYPE; v_Prec C_CURRENCY.STDPRECISION%TYPE; - v_PricePrec C_CURRENCY.PRICEPRECISION%TYPE; v_AttrSetValueType M_Product.AttrSetValueType%TYPE; v_DocTaxAmount C_TAX.DocTaxAmount%TYPE; @@ -90,8 +88,8 @@ /************************************************************************** * Calculate Tax, etc. */ - SELECT processed, stdPrecision, priceprecision, m_pricelist.istaxincluded, M_WAREHOUSE_ID, C_BPARTNER_LOCATION_ID, C_PROJECT_ID, ISSOTRX - INTO v_processed, v_prec, v_PricePrec, v_istaxincluded, v_Warehouse_ID, v_Bpartner_Location_ID, v_Project_ID, v_IsSOTRX + SELECT stdPrecision, m_pricelist.istaxincluded, M_WAREHOUSE_ID, C_BPARTNER_LOCATION_ID, C_PROJECT_ID, ISSOTRX + INTO v_prec, v_istaxincluded, v_Warehouse_ID, v_Bpartner_Location_ID, v_Project_ID, v_IsSOTRX FROM c_order JOIN c_currency ON c_order.c_currency_id = c_currency.c_currency_id JOIN m_pricelist ON c_order.m_pricelist_id = m_pricelist.m_pricelist_id diff -r ecd83704f4fc src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml --- a/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml Thu Dec 14 16:09:28 2017 +0100 @@ -27,7 +27,6 @@ v_IsSOTrx CHAR(1); v_Message VARCHAR2(2000):=''; v_QTYVARIABLE CHAR(1); - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); BEGIN @@ -115,7 +114,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/C_PROJECTLINE_TRG.xml --- a/src-db/database/model/triggers/C_PROJECTLINE_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_PROJECTLINE_TRG.xml Thu Dec 14 16:09:28 2017 +0100 @@ -29,7 +29,6 @@ * Set Line PlannedAmt, PlannedMarginAmt ************************************************************************/ v_PriceLimit NUMBER:=NULL; - v_PriceStd NUMBER:=NULL; v_PlannedMargin NUMBER:=NULL; BEGIN @@ -44,10 +43,8 @@ END IF; -- Get Margin from Product IF(:new.M_Product_ID IS NOT NULL AND :new.PlannedPrice <> 0) THEN - SELECT COALESCE(MAX(PriceLimit), 0), - COALESCE(MAX(PriceStd), 0) - INTO v_PriceLimit, - v_PriceStd + SELECT COALESCE(MAX(PriceLimit), 0) + INTO v_PriceLimit FROM M_ProductPrice WHERE M_Product_ID=:new.M_Product_ID AND M_PriceList_Version_ID= diff -r ecd83704f4fc src-db/database/model/triggers/C_PROJECT_TRG3.xml --- a/src-db/database/model/triggers/C_PROJECT_TRG3.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/C_PROJECT_TRG3.xml Thu Dec 14 16:09:28 2017 +0100 @@ -24,7 +24,6 @@ ************************************************************************/ v_Tree_ID varchar2(32); - v_Parent_ID VARCHAR2(32); v_count NUMBER; BEGIN @@ -34,10 +33,8 @@ IF(DELETING) THEN - SELECT c.AD_Tree_Project_ID, - n.Node_ID - INTO v_Tree_ID, - v_Parent_ID + SELECT c.AD_Tree_Project_ID + INTO v_Tree_ID FROM AD_ClientInfo c, AD_TreeNode n WHERE c.AD_Tree_Project_ID=n.AD_Tree_ID diff -r ecd83704f4fc src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml --- a/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml Thu Dec 14 16:09:28 2017 +0100 @@ -21,7 +21,6 @@ ************************************************************************/ v_AttrSetValueType M_Product.AttrSetValueType%TYPE; - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); BEGIN @@ -42,7 +41,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_COSTADJUSTMENTLINE_CHK_TRG.xml --- a/src-db/database/model/triggers/M_COSTADJUSTMENTLINE_CHK_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_COSTADJUSTMENTLINE_CHK_TRG.xml Thu Dec 14 16:09:28 2017 +0100 @@ -24,7 +24,6 @@ * Contributor(s): ______________________________________. ************************************************************************/ v_Processed VARCHAR(60) ; - v_DocStatus VARCHAR(60) ; v_m_costadjustment_ID VARCHAR2(32) ; v_Posted VARCHAR(60) ; v_DateNull DATE := TO_DATE('01-01-1900', 'DD-MM-YYYY'); @@ -40,7 +39,7 @@ ELSE v_M_costadjustment_ID:=:old.M_costadjustment_ID; END IF; - SELECT PROCESSED, DOCSTATUS, POSTED INTO v_Processed, v_DocStatus, v_Posted FROM M_costadjustment WHERE M_costadjustment_ID=v_M_costadjustment_ID; + SELECT PROCESSED, POSTED INTO v_Processed, v_Posted FROM M_costadjustment WHERE M_costadjustment_ID=v_M_costadjustment_ID; IF UPDATING THEN IF(v_Processed='Y' AND ((COALESCE(:old.LINE, 0) <> COALESCE(:new.LINE, 0)) OR (COALESCE(:old.m_costadjustment_id, '0') <> COALESCE(:new.m_costadjustment_id, '0')) diff -r ecd83704f4fc src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml --- a/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml Thu Dec 14 16:09:28 2017 +0100 @@ -25,7 +25,6 @@ v_MOVEMENTQTY NUMBER; v_QUANTITYORDER NUMBER; v_AttrSetValueType M_Product.AttrSetValueType%TYPE; - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); BEGIN @@ -89,7 +88,7 @@ END IF; END IF; IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml --- a/src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml Thu Dec 14 16:09:28 2017 +0100 @@ -22,7 +22,6 @@ * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); BEGIN @@ -45,7 +44,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml --- a/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml Thu Dec 14 16:09:29 2017 +0100 @@ -27,7 +27,6 @@ v_DocStatus VARCHAR(60) ; v_M_INOUT_ID VARCHAR2(32) ; v_Posted VARCHAR(60) ; - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); BEGIN @@ -74,7 +73,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml --- a/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml Thu Dec 14 16:09:29 2017 +0100 @@ -10,7 +10,6 @@ v_RO NUMBER; V_STOCKED NUMBER; v_AttrSetValueType M_Product.AttrSetValueType%TYPE; - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); /****************************************************************************** * The contents of this file are subject to the Compiere License Version 1.1 @@ -120,7 +119,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_OFFER_TYPE_MOD_TRG.xml --- a/src-db/database/model/triggers/M_OFFER_TYPE_MOD_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_OFFER_TYPE_MOD_TRG.xml Thu Dec 14 16:09:29 2017 +0100 @@ -21,7 +21,6 @@ ************************************************************************/ devTemplate NUMBER; devModule CHAR(1); - cuerrentID VARCHAR2(32); cuerrentModuleID VARCHAR2(32); vAux NUMBER; @@ -51,10 +50,8 @@ AND Type = 'T'; IF (UPDATING OR INSERTING) THEN - cuerrentID := :new.m_offer_type_ID; cuerrentModuleID := :new.AD_Module_ID; ELSE - cuerrentID := :old.m_offer_type_ID; cuerrentModuleID := :old.AD_Module_ID; END IF; diff -r ecd83704f4fc src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml --- a/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml Thu Dec 14 16:09:29 2017 +0100 @@ -14,7 +14,6 @@ v_AttrSetValueType M_Product.AttrSetValueType%TYPE; v_PRODUCTION_ID VARCHAR2(32); v_LINE NUMBER; - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); /************************************************************************* * The contents of this file are subject to the Compiere Public @@ -142,7 +141,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml --- a/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml Thu Dec 14 16:09:29 2017 +0100 @@ -21,7 +21,6 @@ v_DocStatus VARCHAR(60); v_ReqStatus VARCHAR(60); v_OrderedQty NUMBER; - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); BEGIN @@ -92,7 +91,7 @@ IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_RESERVATION_TRG.xml --- a/src-db/database/model/triggers/M_RESERVATION_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_RESERVATION_TRG.xml Thu Dec 14 16:09:29 2017 +0100 @@ -25,7 +25,6 @@ v_preservedcount NUMBER; v_count NUMBER; v_dummy VARCHAR2(2000); - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); v_updateOrderAndLines CHAR(1) := 'N'; -- Parameter @@ -159,7 +158,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml --- a/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml Thu Dec 14 16:09:29 2017 +0100 @@ -21,7 +21,6 @@ ************************************************************************/ v_AttrSetValueType M_Product.AttrSetValueType%TYPE; - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); BEGIN @@ -42,7 +41,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/M_TRANSACTION_TRG2.xml --- a/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml Thu Dec 14 16:09:29 2017 +0100 @@ -22,7 +22,6 @@ v_onhand NUMBER; v_reserved NUMBER; v_count NUMBER; - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); v_attr_description VARCHAR2(255); @@ -94,7 +93,7 @@ END IF; END IF; IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN diff -r ecd83704f4fc src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml --- a/src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml Fri Nov 24 17:36:51 2017 -0500 +++ b/src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml Thu Dec 14 16:09:31 2017 +0100 @@ -30,7 +30,6 @@ v_BP_PL_Currency_ID VARCHAR2(32); v_Count NUMBER; v_Posted VARCHAR(60); - v_productname m_product.name%TYPE; v_isgeneric CHAR(1); BEGIN @@ -152,7 +151,7 @@ END IF; IF (INSERTING OR UPDATING) THEN IF (:NEW.m_product_id IS NOT NULL) THEN - SELECT isgeneric, name INTO v_isgeneric, v_productname + SELECT isgeneric INTO v_isgeneric FROM m_product WHERE m_product_id = :NEW.m_product_id; IF (v_isgeneric = 'Y') THEN