0004742: Two PL procedures (in r2.5x) dont compile after the uuid merge

Index: src-db/database/model/functions/C_BP_GROUP_ACCT_COPY.xml
===================================================================
--- src-db/database/model/functions/C_BP_GROUP_ACCT_COPY.xml	(revision 6621)
+++ src-db/database/model/functions/C_BP_GROUP_ACCT_COPY.xml	(working copy)
@@ -57,8 +57,6 @@
     --
     v_Deleted NUMBER:=0;
     v_Created NUMBER:=0;
-    v_C_BP_Customer_ID VARCHAR2(32) ;
-    v_C_BP_Vendor_ID VARCHAR2(32) ;
     rowcount NUMBER;
   BEGIN
     --  Update AD_PInstance
@@ -125,14 +123,13 @@
                      AND P.ISCUSTOMER = 'Y'
                      AND P.C_BP_Group_ID = v_C_BP_Group_ID
 					 AND (A.C_AcctSchema_ID = v_C_AcctSchema_ID OR v_C_AcctSchema_ID IS NULL)) LOOP
-     Ad_Sequence_Next('C_BP_Customer_Acct', Cur_BP.AD_Client_ID, v_C_BP_Customer_ID);
      INSERT INTO C_BP_Customer_Acct
-           (C_BP_Customer_Acct_ID, C_BP_Customer_Acct_Id, C_BPartner_ID, C_AcctSchema_ID, AD_Client_ID,
+           (C_BP_Customer_Acct_ID, C_BPartner_ID, C_AcctSchema_ID, AD_Client_ID,
             AD_Org_ID, IsActive, Created, CreatedBy,
             Updated, UpdatedBy, C_Receivable_Acct, C_PrePayment_Acct,
             Status)
        VALUES
-           (get_uuid(), v_C_BP_Customer_ID, Cur_BP.C_BPartner_ID, Cur_BP.C_AcctSchema_ID, Cur_BP.AD_Client_ID,
+           (get_uuid(), Cur_BP.C_BPartner_ID, Cur_BP.C_AcctSchema_ID, Cur_BP.AD_Client_ID,
             Cur_BP.AD_Org_ID,'Y', now(), 0,
             now(), 0, Cur_BP.C_Receivable_Acct, Cur_BP.C_PrePayment_Acct,
             Cur_BP.Status);
@@ -150,14 +147,13 @@
                      AND P.ISVENDOR = 'Y'
                      AND P.C_BP_Group_ID = v_C_BP_Group_ID
 					 AND (A.C_AcctSchema_ID = v_C_AcctSchema_ID OR v_C_AcctSchema_ID IS NULL)) LOOP
-     Ad_Sequence_Next('C_BP_Vendor_Acct', Cur_BP.AD_Client_ID, v_C_BP_Vendor_ID);
      INSERT INTO C_BP_Vendor_Acct
-           (C_BP_Vendor_Acc_ID, tC_BP_Vendor_Acct_Id, C_BPartner_ID, C_AcctSchema_ID, AD_Client_ID,
+           (C_BP_Vendor_Acct_ID, C_BPartner_ID, C_AcctSchema_ID, AD_Client_ID,
             AD_Org_ID, IsActive, Created, CreatedBy,
             Updated, UpdatedBy, V_Liability_Acct, V_Liability_Services_Acct,
             V_PrePayment_Acct, Status)
        VALUES
-           (get_uuid(), v_C_BP_Vendor_ID, Cur_BP.C_BPartner_ID, Cur_BP.C_AcctSchema_ID, Cur_BP.AD_Client_ID,
+           (get_uuid(), Cur_BP.C_BPartner_ID, Cur_BP.C_AcctSchema_ID, Cur_BP.AD_Client_ID,
             Cur_BP.AD_Org_ID,'Y', now(), 0,
             now(), 0, Cur_BP.V_Liability_Acct, Cur_BP.V_Liability_Services_Acct,
             Cur_BP.V_PrePayment_Acct, Cur_BP.Status);
Index: src-db/database/model/functions/AD_SYNCHRONIZE.xml
===================================================================
--- src-db/database/model/functions/AD_SYNCHRONIZE.xml	(revision 6621)
+++ src-db/database/model/functions/AD_SYNCHRONIZE.xml	(working copy)
@@ -71,11 +71,7 @@
     ---------------------------------------------------------------------------
     DBMS_OUTPUT.PUT_LINE('Adding missing Elements') ;
     DECLARE
-<<<<<<< .working
-      NextNo VARCHAR2(32);
-=======
       NextNo varchar2(32);
->>>>>>> .merge-right.r6268
       Cur_Column RECORD;
       Cur_Process RECORD;
     BEGIN