0040174: Upload data: product into discount, business partner set, import bp into bp set, set bp-set in discount, load in webpos

diff --git a/src-db/database/sourcedata/OBMOBC_SERVICES.xml b/src-db/database/sourcedata/OBMOBC_SERVICES.xml
--- a/src-db/database/sourcedata/OBMOBC_SERVICES.xml
+++ b/src-db/database/sourcedata/OBMOBC_SERVICES.xml
@@ -142,6 +142,30 @@
 <!--15FBA928E97B4B9C847275A3E6DCB3FB-->  <SERVER_RUNTIME><![CDATA[OBSTSYN_ON_CENTRAL]]></SERVER_RUNTIME>
 <!--15FBA928E97B4B9C847275A3E6DCB3FB--></OBMOBC_SERVICES>
 
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F--><OBMOBC_SERVICES>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <OBMOBC_SERVICES_ID><![CDATA[1AAA1A4EDE06462A85BD7B582A71EB3F]]></OBMOBC_SERVICES_ID>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.master.DiscountBusinessPartnerSet]]></SERVICE>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <DESCRIPTION><![CDATA[Master data service for the relation between the discount and the business partner set]]></DESCRIPTION>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F-->  <SERVER_RUNTIME><![CDATA[OBSTSYN_ON_CENTRAL]]></SERVER_RUNTIME>
+<!--1AAA1A4EDE06462A85BD7B582A71EB3F--></OBMOBC_SERVICES>
+
+<!--22AFB1A0D69D4E39995775BD76C59F90--><OBMOBC_SERVICES>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <OBMOBC_SERVICES_ID><![CDATA[22AFB1A0D69D4E39995775BD76C59F90]]></OBMOBC_SERVICES_ID>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <SERVICE><![CDATA[org.openbravo.retail.posterminal.master.BPSetLine]]></SERVICE>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <DESCRIPTION><![CDATA[Master data service for the business partner by business partner set]]></DESCRIPTION>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE>
+<!--22AFB1A0D69D4E39995775BD76C59F90-->  <SERVER_RUNTIME><![CDATA[OBSTSYN_ON_CENTRAL]]></SERVER_RUNTIME>
+<!--22AFB1A0D69D4E39995775BD76C59F90--></OBMOBC_SERVICES>
+
 <!--26D7819DE01543978004B92014FB2F7F--><OBMOBC_SERVICES>
 <!--26D7819DE01543978004B92014FB2F7F-->  <OBMOBC_SERVICES_ID><![CDATA[26D7819DE01543978004B92014FB2F7F]]></OBMOBC_SERVICES_ID>
 <!--26D7819DE01543978004B92014FB2F7F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
--- a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
+++ b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java
@@ -89,6 +89,8 @@
                                                                                             // Customer
                                                                                             // Address
         "model/currencypanel", "model/country", "model/salesrepresentative",
+        "model/discountset",
+        "model/bpartnerset",
         "model/productcharacteristicvalue", "model/characteristicvalue", "model/characteristic",
         "model/brand", "model/returnreasons", "model/executor", "model/terminal-model",
         "model/paymentmethodcashup", "model/taxcashup", "model/returnreasons",
diff --git a/src/org/openbravo/retail/posterminal/master/BPSetLine.java b/src/org/openbravo/retail/posterminal/master/BPSetLine.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/retail/posterminal/master/BPSetLine.java
@@ -0,0 +1,99 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2019 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+package org.openbravo.retail.posterminal.master;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.client.kernel.ComponentProvider.Qualifier;
+import org.openbravo.mobile.core.model.HQLProperty;
+import org.openbravo.mobile.core.model.HQLPropertyList;
+import org.openbravo.mobile.core.model.ModelExtension;
+import org.openbravo.mobile.core.model.ModelExtensionUtils;
+import org.openbravo.model.common.businesspartner.BusinessPartnerSetLine;
+import org.openbravo.retail.posterminal.ProcessHQLQuery;
+
+public class BPSetLine extends ProcessHQLQuery {
+  public static final String bpSetLinePropertyExtension = "OBPOS_BusinessPartnerSetLineExtension";
+
+  @Inject
+  @Any
+  @Qualifier(bpSetLinePropertyExtension)
+  private Instance<ModelExtension> extensions;
+
+  @Override
+  protected List<HQLPropertyList> getHqlProperties(JSONObject jsonsent) {
+    List<HQLPropertyList> propertiesList = new ArrayList<HQLPropertyList>();
+    HQLPropertyList regularCountryHQLProperties = ModelExtensionUtils
+        .getPropertyExtensions(extensions);
+
+    propertiesList.add(regularCountryHQLProperties);
+
+    return propertiesList;
+  }
+
+  @Override
+  protected List<String> getQuery(JSONObject jsonsent) throws JSONException {
+
+    HQLPropertyList regularCountryHQLProperties = ModelExtensionUtils
+        .getPropertyExtensions(extensions);
+
+    String hql = "select" + regularCountryHQLProperties.getHqlSelect()
+        + "from BusinessPartnerSetLine c where c.$incrementalUpdateCriteria "
+        + "and c.$naturalOrgCriteria "
+        + "and c.$readableSimpleClientCriteria and c.$activeCriteria";
+
+    boolean fullRefresh = jsonsent.has("lastUpdated")
+        && !jsonsent.get("lastUpdated").equals("undefined")
+        && !jsonsent.get("lastUpdated").equals("null") ? false : true;
+
+    // if full refresh then only retrieve the lines valid now and in the future
+    if (fullRefresh) {
+      hql += " and (" + BusinessPartnerSetLine.PROPERTY_ENDINGDATE + " is null or "
+          + BusinessPartnerSetLine.PROPERTY_ENDINGDATE + ">=NOW()) ";
+    }
+    hql += " order by c.id asc";
+
+    return Arrays.asList(new String[] { hql });
+  }
+
+  @Override
+  protected boolean bypassPreferenceCheck() {
+    return true;
+  }
+
+  @Override
+  protected boolean isAdminMode() {
+    return true;
+  }
+
+  @Qualifier(bpSetLinePropertyExtension)
+  public static class BPSetLineProperties extends ModelExtension {
+
+    @Override
+    public List<HQLProperty> getHQLProperties(Object params) {
+      ArrayList<HQLProperty> list = new ArrayList<HQLProperty>();
+      list.add(new HQLProperty("c.id", "id"));
+      list.add(new HQLProperty("c.bpSet.id", "bpSet"));
+      list.add(new HQLProperty("c.businessPartner.id", "businessPartner"));
+      list.add(new HQLProperty("c.startingDate", "startingDate"));
+      list.add(new HQLProperty("c.endingDate", "endingDate"));
+      return list;
+    }
+
+  }
+
+}
diff --git a/src/org/openbravo/retail/posterminal/master/DiscountBusinessPartnerSet.java b/src/org/openbravo/retail/posterminal/master/DiscountBusinessPartnerSet.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/retail/posterminal/master/DiscountBusinessPartnerSet.java
@@ -0,0 +1,85 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2019 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+package org.openbravo.retail.posterminal.master;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.client.kernel.ComponentProvider.Qualifier;
+import org.openbravo.mobile.core.model.HQLProperty;
+import org.openbravo.mobile.core.model.HQLPropertyList;
+import org.openbravo.mobile.core.model.ModelExtension;
+import org.openbravo.mobile.core.model.ModelExtensionUtils;
+import org.openbravo.retail.posterminal.ProcessHQLQuery;
+
+public class DiscountBusinessPartnerSet extends ProcessHQLQuery {
+  public static final String discountBPPropertyExtension = "OBPOS_DiscountBusinessPartnerSetExtension";
+
+  @Inject
+  @Any
+  @Qualifier(discountBPPropertyExtension)
+  private Instance<ModelExtension> extensions;
+
+  @Override
+  protected List<HQLPropertyList> getHqlProperties(JSONObject jsonsent) {
+    List<HQLPropertyList> propertiesList = new ArrayList<HQLPropertyList>();
+    HQLPropertyList regularCountryHQLProperties = ModelExtensionUtils
+        .getPropertyExtensions(extensions);
+
+    propertiesList.add(regularCountryHQLProperties);
+
+    return propertiesList;
+  }
+
+  @Override
+  protected List<String> getQuery(JSONObject jsonsent) throws JSONException {
+
+    HQLPropertyList regularCountryHQLProperties = ModelExtensionUtils
+        .getPropertyExtensions(extensions);
+
+    String hql = "select" + regularCountryHQLProperties.getHqlSelect()
+        + "from PricingAdjustmentBusinessPartnerSet c where c.$incrementalUpdateCriteria "
+        + "and c.$naturalOrgCriteria "
+        + "and c.$readableSimpleClientCriteria and c.$activeCriteria order by c.id asc";
+
+    return Arrays.asList(new String[] { hql });
+  }
+
+  @Override
+  protected boolean bypassPreferenceCheck() {
+    return true;
+  }
+
+  @Override
+  protected boolean isAdminMode() {
+    return true;
+  }
+
+  @Qualifier(discountBPPropertyExtension)
+  public static class DiscountBPProperties extends ModelExtension {
+
+    @Override
+    public List<HQLProperty> getHQLProperties(Object params) {
+      ArrayList<HQLProperty> list = new ArrayList<HQLProperty>();
+      list.add(new HQLProperty("c.id", "id"));
+      list.add(new HQLProperty("c.bpSet.id", "bpSet"));
+      list.add(new HQLProperty("c.promotionDiscount.id", "discount"));
+      return list;
+    }
+
+  }
+
+}
diff --git a/web/org.openbravo.retail.posterminal/js/model/bpartnerset.js b/web/org.openbravo.retail.posterminal/js/model/bpartnerset.js
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.retail.posterminal/js/model/bpartnerset.js
@@ -0,0 +1,45 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2019 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+
+(function () {
+
+  var BPSetLine = OB.Data.ExtensibleModel.extend({
+    modelName: 'BPSetLine',
+    tableName: 'c_bp_set_line',
+    entityName: 'BPSetLine',
+    dataLimit: OB.Dal.DATALIMIT,
+    paginationById: true,
+    source: 'org.openbravo.retail.posterminal.master.BPSetLine'
+  });
+
+  BPSetLine.addProperties([{
+    name: 'id',
+    column: 'c_bp_set_line_id',
+    primaryKey: true,
+    type: 'TEXT'
+  }, {
+    name: 'bpSet',
+    column: 'c_bp_set_id',
+    type: 'TEXT'
+  }, {
+    name: 'businessPartner',
+    column: 'c_bpartner_id',
+    type: 'TEXT'
+  }, {
+    name: 'startingDate',
+    column: 'startdate',
+    type: 'DATE'
+  }, {
+    name: 'endingDate',
+    column: 'enddate',
+    type: 'DATE'
+  }]);
+
+  OB.Data.Registry.registerModel(BPSetLine);
+}());
\ No newline at end of file
diff --git a/web/org.openbravo.retail.posterminal/js/model/discounts.js b/web/org.openbravo.retail.posterminal/js/model/discounts.js
--- a/web/org.openbravo.retail.posterminal/js/model/discounts.js
+++ b/web/org.openbravo.retail.posterminal/js/model/discounts.js
@@ -324,6 +324,20 @@
     + " WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID" //
     + "   AND C_BPARTNER_ID = ?" //
     + " )))" //
+    + " AND((BP_SET_SELECTION = 'Y'" //
+    + " AND NOT EXISTS" //
+    + " (SELECT 1" //
+    + " FROM M_OFFER_BP_SET OBPS, C_BP_SET_LINE BPL" //
+    + " WHERE OBPS.C_BP_SET_ID = BPL.C_BP_SET_ID" //
+    + "   AND BPL.C_BPARTNER_ID = ? AND datetime('now') BETWEEN COALESCE(datetime(BPL.STARTDATE), datetime('2000-12-31T00:00:00')) AND COALESCE(datetime(BPL.ENDDATE), datetime('9999-12-31T23:59:59'))" //
+    + " ))" //
+    + " OR(BP_SET_SELECTION = 'N'" //
+    + " AND EXISTS" //
+    + " (SELECT 1" //
+    + " FROM M_OFFER_BP_SET OBPS, C_BP_SET_LINE BPL" //
+    + " WHERE OBPS.C_BP_SET_ID = BPL.C_BP_SET_ID" //
+    + "   AND BPL.C_BPARTNER_ID = ? AND datetime('now') BETWEEN COALESCE(datetime(BPL.STARTDATE), datetime('2000-12-31T00:00:00')) AND COALESCE(datetime(BPL.ENDDATE), datetime('9999-12-31T23:59:59'))" //
+    + " )))" //
     + " AND((BP_GROUP_SELECTION = 'Y'" //
     + " AND NOT EXISTS" //
     + " (SELECT 1" //
diff --git a/web/org.openbravo.retail.posterminal/js/model/discountset.js b/web/org.openbravo.retail.posterminal/js/model/discountset.js
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.retail.posterminal/js/model/discountset.js
@@ -0,0 +1,35 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2019 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+
+(function () {
+
+  var DiscountBusinessPartnerSet = OB.Data.ExtensibleModel.extend({
+    modelName: 'DiscountBusinessPartnerSet',
+    tableName: 'm_offer_bp_set',
+    entityName: 'DiscountBusinessPartnerSet',
+    source: 'org.openbravo.retail.posterminal.master.DiscountBusinessPartnerSet'
+  });
+
+  DiscountBusinessPartnerSet.addProperties([{
+    name: 'id',
+    column: 'm_offer_bp_set_id',
+    primaryKey: true,
+    type: 'TEXT'
+  }, {
+    name: 'discount',
+    column: 'm_offer_id',
+    type: 'TEXT'
+  }, {
+    name: 'bpSet',
+    column: 'c_bp_set_id',
+    type: 'TEXT'
+  }]);
+
+  OB.Data.Registry.registerModel(DiscountBusinessPartnerSet);
+}());
\ No newline at end of file
diff --git a/web/org.openbravo.retail.posterminal/js/model/executor.js b/web/org.openbravo.retail.posterminal/js/model/executor.js
--- a/web/org.openbravo.retail.posterminal/js/model/executor.js
+++ b/web/org.openbravo.retail.posterminal/js/model/executor.js
@@ -131,7 +131,7 @@
 OB.Model.DiscountsExecutor = OB.Model.Executor.extend({
   // parameters that will be used in the SQL to get promotions, in case this SQL is extended,
   // these parameters might be required to be extended too
-  criteriaParams: ['date', 'bpId', 'bpId', 'bpId', 'bpId', 'productId', 'productId', 'categoryId', 'categoryId', 'productId', 'productId', 'priceListId', 'priceListId'],
+  criteriaParams: ['date', 'bpId', 'bpId', 'bpId', 'bpId', 'bpId', 'bpId', 'productId', 'productId', 'categoryId', 'categoryId', 'productId', 'productId', 'priceListId', 'priceListId'],
 
   // defines the property each of the parameters in criteriaParams is translated to, in case of
   // different parameters than standard ones this should be extended
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
@@ -46,7 +46,7 @@
     modelName: 'DiscountFilterCharacteristic'
   },
   OB.Model.ProductServiceLinked, //
-  OB.Model.CurrencyPanel, OB.Model.SalesRepresentative, OB.Model.Brand, OB.Model.ProductCharacteristicValue, OB.Model.CharacteristicValue, OB.Model.Characteristic, OB.Model.ReturnReason, OB.Model.CashUp, OB.Model.OfflinePrinter, OB.Model.PaymentMethodCashUp, OB.Model.TaxCashUp, OB.Model.Country],
+  OB.Model.CurrencyPanel, OB.Model.SalesRepresentative, OB.Model.Brand, OB.Model.ProductCharacteristicValue, OB.Model.CharacteristicValue, OB.Model.Characteristic, OB.Model.ReturnReason, OB.Model.CashUp, OB.Model.OfflinePrinter, OB.Model.PaymentMethodCashUp, OB.Model.TaxCashUp, OB.Model.Country, OB.Model.BPSetLine, OB.Model.DiscountBusinessPartnerSet],
 
   loadUnpaidOrders: function (loadUnpaidOrdersCallback) {
     // Shows a modal window with the orders pending to be paid

diff --git a/referencedata/sampledata/The_White_Valley_Group/AD_WINDOW_ACCESS.xml b/referencedata/sampledata/The_White_Valley_Group/AD_WINDOW_ACCESS.xml
--- a/referencedata/sampledata/The_White_Valley_Group/AD_WINDOW_ACCESS.xml
+++ b/referencedata/sampledata/The_White_Valley_Group/AD_WINDOW_ACCESS.xml
@@ -2745,6 +2745,20 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
+  <AD_WINDOW_ACCESS_ID><![CDATA[2E7578DF79AF4A2BB1E02DC6AB879BCE]]></AD_WINDOW_ACCESS_ID>
+  <AD_WINDOW_ID><![CDATA[3E459D89D8FE4E399E2183AE1A9E78FA]]></AD_WINDOW_ID>
+  <AD_ROLE_ID><![CDATA[9556CBD6CE7E414D9E063701A069318C]]></AD_ROLE_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2019-03-06 08:53:45.0]]></CREATED>
+  <CREATEDBY><![CDATA[0]]></CREATEDBY>
+  <UPDATED><![CDATA[2019-03-06 08:53:45.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
+</AD_WINDOW_ACCESS>
+
+<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[2E8EA3C99BF7425E9C5149ED464969EA]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[81BAC97FE7754C669254C9CF4FA20292]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[41DAFA0C214D4954A6A9B383AF9A3D96]]></AD_ROLE_ID>
@@ -5097,6 +5111,20 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
+  <AD_WINDOW_ACCESS_ID><![CDATA[4BFA2CFAFE004D14AAFD7CEDBA4A3FCB]]></AD_WINDOW_ACCESS_ID>
+  <AD_WINDOW_ID><![CDATA[3E459D89D8FE4E399E2183AE1A9E78FA]]></AD_WINDOW_ID>
+  <AD_ROLE_ID><![CDATA[41DAFA0C214D4954A6A9B383AF9A3D96]]></AD_ROLE_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2019-03-06 08:53:45.0]]></CREATED>
+  <CREATEDBY><![CDATA[0]]></CREATEDBY>
+  <UPDATED><![CDATA[2019-03-06 08:53:45.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
+</AD_WINDOW_ACCESS>
+
+<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[4C6FC18F1C86413987B7A4D159FB5755]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[210]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[9556CBD6CE7E414D9E063701A069318C]]></AD_ROLE_ID>
@@ -7491,6 +7519,20 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
+  <AD_WINDOW_ACCESS_ID><![CDATA[70779221CB5E4660890C2BFE11545B2C]]></AD_WINDOW_ACCESS_ID>
+  <AD_WINDOW_ID><![CDATA[3E459D89D8FE4E399E2183AE1A9E78FA]]></AD_WINDOW_ID>
+  <AD_ROLE_ID><![CDATA[D4045F23B4044A39BA2E8BAD707942AF]]></AD_ROLE_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2019-03-06 08:53:45.0]]></CREATED>
+  <CREATEDBY><![CDATA[0]]></CREATEDBY>
+  <UPDATED><![CDATA[2019-03-06 08:53:45.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
+</AD_WINDOW_ACCESS>
+
+<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[707B5BA7B90F4C67B29A90083FA10F49]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[FC6A51DF5F32451987C0C84D7B338B94]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[E717F902C44C455793463450495FF36B]]></AD_ROLE_ID>
@@ -13805,6 +13847,20 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
+  <AD_WINDOW_ACCESS_ID><![CDATA[C6B2286C07A4471E88718EDB1144EF28]]></AD_WINDOW_ACCESS_ID>
+  <AD_WINDOW_ID><![CDATA[3E459D89D8FE4E399E2183AE1A9E78FA]]></AD_WINDOW_ID>
+  <AD_ROLE_ID><![CDATA[5FA11B3DD8F04C0986C774624809C31E]]></AD_ROLE_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2019-03-06 08:53:45.0]]></CREATED>
+  <CREATEDBY><![CDATA[0]]></CREATEDBY>
+  <UPDATED><![CDATA[2019-03-06 08:53:45.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
+</AD_WINDOW_ACCESS>
+
+<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[C6E8906FBC6A4480BD82EB2FA25B7056]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[E7754848A0314B018B37C1428ECB4D21]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[9556CBD6CE7E414D9E063701A069318C]]></AD_ROLE_ID>
@@ -13861,6 +13917,20 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
+  <AD_WINDOW_ACCESS_ID><![CDATA[C7FB342AD3184015933F3A06CB91C52C]]></AD_WINDOW_ACCESS_ID>
+  <AD_WINDOW_ID><![CDATA[3E459D89D8FE4E399E2183AE1A9E78FA]]></AD_WINDOW_ID>
+  <AD_ROLE_ID><![CDATA[E717F902C44C455793463450495FF36B]]></AD_ROLE_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2019-03-06 08:53:45.0]]></CREATED>
+  <CREATEDBY><![CDATA[0]]></CREATEDBY>
+  <UPDATED><![CDATA[2019-03-06 08:53:45.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
+</AD_WINDOW_ACCESS>
+
+<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[C87204BB9C314482B98EA21610807D06]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[6A5963EA222743ACB44F9C65DF7F658C]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[9556CBD6CE7E414D9E063701A069318C]]></AD_ROLE_ID>
@@ -16787,6 +16857,20 @@
 </AD_WINDOW_ACCESS>
 
 <AD_WINDOW_ACCESS>
+  <AD_WINDOW_ACCESS_ID><![CDATA[F0547868B7ED44BCAD8268B870768117]]></AD_WINDOW_ACCESS_ID>
+  <AD_WINDOW_ID><![CDATA[3E459D89D8FE4E399E2183AE1A9E78FA]]></AD_WINDOW_ID>
+  <AD_ROLE_ID><![CDATA[463683CFA16C40C0A4EC8CF934114146]]></AD_ROLE_ID>
+  <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2019-03-06 08:53:45.0]]></CREATED>
+  <CREATEDBY><![CDATA[0]]></CREATEDBY>
+  <UPDATED><![CDATA[2019-03-06 08:53:45.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <ISREADWRITE><![CDATA[Y]]></ISREADWRITE>
+</AD_WINDOW_ACCESS>
+
+<AD_WINDOW_ACCESS>
   <AD_WINDOW_ACCESS_ID><![CDATA[F071D5921A3142A9AF533E910C814599]]></AD_WINDOW_ACCESS_ID>
   <AD_WINDOW_ID><![CDATA[800076]]></AD_WINDOW_ID>
   <AD_ROLE_ID><![CDATA[9556CBD6CE7E414D9E063701A069318C]]></AD_ROLE_ID>
diff --git a/referencedata/sampledata/The_White_Valley_Group/M_OFFER.xml b/referencedata/sampledata/The_White_Valley_Group/M_OFFER.xml
--- a/referencedata/sampledata/The_White_Valley_Group/M_OFFER.xml
+++ b/referencedata/sampledata/The_White_Valley_Group/M_OFFER.xml
@@ -23,6 +23,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_PERCENTAGE><![CDATA[5]]></EM_OBDISC_PERCENTAGE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
@@ -55,6 +56,7 @@
   <ORG_SELECTION><![CDATA[N]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_PERCENTAGE><![CDATA[40]]></EM_OBDISC_PERCENTAGE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
@@ -87,6 +89,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -118,6 +121,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -151,6 +155,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[3]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[2]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -185,6 +190,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[6]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[5]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[AVG]]></EM_OBDISC_SUBTYPE>
@@ -219,6 +225,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -250,6 +257,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
   <EM_OBDISC_AMT><![CDATA[22.5]]></EM_OBDISC_AMT>
@@ -283,6 +291,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[Y]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -315,6 +324,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -346,6 +356,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -377,6 +388,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_PRICE><![CDATA[385]]></EM_OBDISC_PRICE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
@@ -410,6 +422,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
   <EM_OBDISC_AMT><![CDATA[60]]></EM_OBDISC_AMT>
@@ -444,6 +457,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[3]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[2]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -480,6 +494,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[6]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[4]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -514,6 +529,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -546,6 +562,7 @@
   <ISMULTIPLE><![CDATA[Y]]></ISMULTIPLE>
   <MULTIPLE><![CDATA[3]]></MULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -579,6 +596,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[2]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[1]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -613,6 +631,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_PRICE><![CDATA[500]]></EM_OBDISC_PRICE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
@@ -646,6 +665,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
   <EM_OBDISC_AMT><![CDATA[270]]></EM_OBDISC_AMT>
@@ -679,6 +699,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
   <EM_OBDISC_AMT><![CDATA[100]]></EM_OBDISC_AMT>
@@ -712,6 +733,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[3]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[2]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -747,6 +769,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[9]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[6]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -781,6 +804,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -812,6 +836,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -843,6 +868,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[6]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[5]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -877,6 +903,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
   <EM_OBDISC_AMT><![CDATA[5]]></EM_OBDISC_AMT>
@@ -910,6 +937,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[2]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[1]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -945,6 +973,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -976,6 +1005,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -1008,6 +1038,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[N]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[3]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[2]]></EM_OBDISC_Y>
   <EM_OBDISC_SUBTYPE><![CDATA[CHEAPEST]]></EM_OBDISC_SUBTYPE>
@@ -1042,6 +1073,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_PERCENTAGE><![CDATA[5]]></EM_OBDISC_PERCENTAGE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
@@ -1074,6 +1106,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_X><![CDATA[3]]></EM_OBDISC_X>
   <EM_OBDISC_Y><![CDATA[2]]></EM_OBDISC_Y>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
@@ -1107,6 +1140,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_PRICE><![CDATA[12]]></EM_OBDISC_PRICE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
@@ -1140,6 +1174,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_PRICE><![CDATA[385]]></EM_OBDISC_PRICE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
@@ -1176,6 +1211,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
   <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
@@ -1207,6 +1243,7 @@
   <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
   <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
   <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+  <BP_SET_SELECTION><![CDATA[Y]]></BP_SET_SELECTION>
   <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
   <EM_OBDISC_C_CURRENCY_ID><![CDATA[102]]></EM_OBDISC_C_CURRENCY_ID>
   <EM_OBDISC_AMT><![CDATA[5]]></EM_OBDISC_AMT>