calculate price 6 to 8

1 files changed, 1391 insertions, 161 deletions

diff --git a/calculate_price_after_disc.ktr b/calculate_price_after_disc.ktr
index b3ae58c..da4eb5e 100644
--- a/calculate_price_after_disc.ktr
+++ b/calculate_price_after_disc.ktr
@@ -635,53 +635,208 @@
         <name2/>
       </key>
       <value>
-        <name>product_id</name>
-        <rename>product_id</rename>
-        <update>N</update>
+        <name>disc1_1</name>
+        <rename>disc1_1</rename>
+        <update>Y</update>
       </value>
       <value>
-        <name>item_code</name>
-        <rename>item_code</rename>
+        <name>disc1_2</name>
+        <rename>disc1_2</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>name</name>
-        <rename>name</rename>
+        <name>disc1_3</name>
+        <rename>disc1_3</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>pricing_group</name>
-        <rename>pricing_group</rename>
+        <name>disc1_4</name>
+        <rename>disc1_4</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>purchase_price</name>
-        <rename>purchase_price</rename>
+        <name>disc1_5</name>
+        <rename>disc1_5</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std1</name>
-        <rename>markup_std1</rename>
+        <name>disc1_6</name>
+        <rename>disc1_6</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std2</name>
-        <rename>markup_std2</rename>
+        <name>disc1_7</name>
+        <rename>disc1_7</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std3</name>
-        <rename>markup_std3</rename>
+        <name>disc1_8</name>
+        <rename>disc1_8</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std4</name>
-        <rename>markup_std4</rename>
+        <name>disc2_1</name>
+        <rename>disc2_1</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std5</name>
-        <rename>markup_std5</rename>
+        <name>disc2_2</name>
+        <rename>disc2_2</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_3</name>
+        <rename>disc2_3</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_4</name>
+        <rename>disc2_4</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_5</name>
+        <rename>disc2_5</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_6</name>
+        <rename>disc2_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_7</name>
+        <rename>disc2_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_8</name>
+        <rename>disc2_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_1</name>
+        <rename>disc3_1</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_2</name>
+        <rename>disc3_2</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_3</name>
+        <rename>disc3_3</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_4</name>
+        <rename>disc3_4</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_5</name>
+        <rename>disc3_5</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_6</name>
+        <rename>disc3_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_7</name>
+        <rename>disc3_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_8</name>
+        <rename>disc3_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_1</name>
+        <rename>disc4_1</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_2</name>
+        <rename>disc4_2</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_3</name>
+        <rename>disc4_3</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_4</name>
+        <rename>disc4_4</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_5</name>
+        <rename>disc4_5</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_6</name>
+        <rename>disc4_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_7</name>
+        <rename>disc4_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_8</name>
+        <rename>disc4_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_1</name>
+        <rename>disc5_1</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_2</name>
+        <rename>disc5_2</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_3</name>
+        <rename>disc5_3</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_4</name>
+        <rename>disc5_4</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_5</name>
+        <rename>disc5_5</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_6</name>
+        <rename>disc5_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_7</name>
+        <rename>disc5_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_8</name>
+        <rename>disc5_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>item_code</name>
+        <rename>item_code</rename>
         <update>Y</update>
       </value>
       <value>
@@ -710,6 +865,61 @@
         <update>Y</update>
       </value>
       <value>
+        <name>markup_group6</name>
+        <rename>markup_group6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_group7</name>
+        <rename>markup_group7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_group8</name>
+        <rename>markup_group8</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std1</name>
+        <rename>markup_std1</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std2</name>
+        <rename>markup_std2</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std3</name>
+        <rename>markup_std3</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std4</name>
+        <rename>markup_std4</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std5</name>
+        <rename>markup_std5</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std6</name>
+        <rename>markup_std6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std7</name>
+        <rename>markup_std7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std8</name>
+        <rename>markup_std8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier2_1</name>
         <rename>markup_tier2_1</rename>
         <update>Y</update>
@@ -735,6 +945,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier2_6</name>
+        <rename>markup_tier2_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier2_7</name>
+        <rename>markup_tier2_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier2_8</name>
+        <rename>markup_tier2_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier3_1</name>
         <rename>markup_tier3_1</rename>
         <update>Y</update>
@@ -760,6 +985,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier3_6</name>
+        <rename>markup_tier3_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier3_7</name>
+        <rename>markup_tier3_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier3_8</name>
+        <rename>markup_tier3_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier4_1</name>
         <rename>markup_tier4_1</rename>
         <update>Y</update>
@@ -785,6 +1025,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier4_6</name>
+        <rename>markup_tier4_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier4_7</name>
+        <rename>markup_tier4_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier4_8</name>
+        <rename>markup_tier4_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier5_1</name>
         <rename>markup_tier5_1</rename>
         <update>Y</update>
@@ -810,6 +1065,26 @@
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier5_6</name>
+        <rename>markup_tier5_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier5_7</name>
+        <rename>markup_tier5_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier5_8</name>
+        <rename>markup_tier5_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>name</name>
+        <rename>name</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_after_disc_1</name>
         <rename>price_after_disc_1</rename>
         <update>Y</update>
@@ -835,6 +1110,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>price_after_disc_6</name>
+        <rename>price_after_disc_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_after_disc_7</name>
+        <rename>price_after_disc_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_after_disc_8</name>
+        <rename>price_after_disc_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_before_disc1</name>
         <rename>price_before_disc1</rename>
         <update>Y</update>
@@ -860,6 +1150,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>price_before_disc6</name>
+        <rename>price_before_disc6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_before_disc7</name>
+        <rename>price_before_disc7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_before_disc8</name>
+        <rename>price_before_disc8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_tier2_1</name>
         <rename>price_tier2_1</rename>
         <update>Y</update>
@@ -885,6 +1190,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>price_tier2_6</name>
+        <rename>price_tier2_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier2_7</name>
+        <rename>price_tier2_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier2_8</name>
+        <rename>price_tier2_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_tier3_1</name>
         <rename>price_tier3_1</rename>
         <update>Y</update>
@@ -910,6 +1230,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>price_tier3_6</name>
+        <rename>price_tier3_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier3_7</name>
+        <rename>price_tier3_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier3_8</name>
+        <rename>price_tier3_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_tier4_1</name>
         <rename>price_tier4_1</rename>
         <update>Y</update>
@@ -935,6 +1270,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>price_tier4_6</name>
+        <rename>price_tier4_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier4_7</name>
+        <rename>price_tier4_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier4_8</name>
+        <rename>price_tier4_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_tier5_1</name>
         <rename>price_tier5_1</rename>
         <update>Y</update>
@@ -960,172 +1310,272 @@
         <update>Y</update>
       </value>
       <value>
+        <name>price_tier5_6</name>
+        <rename>price_tier5_6</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier5_7</name>
+        <rename>price_tier5_7</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier5_8</name>
+        <rename>price_tier5_8</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>pricing_group</name>
+        <rename>pricing_group</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>product_id</name>
+        <rename>product_id</rename>
+        <update>N</update>
+      </value>
+      <value>
+        <name>purchase_price</name>
+        <rename>purchase_price</rename>
+        <update>Y</update>
+      </value>
+    </lookup>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>736</xloc>
+      <yloc>192</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>Insert / update 2</name>
+    <type>InsertUpdate</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>dw bi indoteknik (localhost)</connection>
+    <commit>100</commit>
+    <update_bypassed>N</update_bypassed>
+    <lookup>
+      <schema>public</schema>
+      <table>pricelist_compute</table>
+      <key>
+        <name>product_id</name>
+        <field>product_id</field>
+        <condition>=</condition>
+        <name2/>
+      </key>
+      <value>
         <name>disc1_1</name>
-        <rename>disc1_1</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc1_2</name>
-        <rename>disc1_2</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc1_3</name>
-        <rename>disc1_3</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc1_4</name>
-        <rename>disc1_4</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc1_5</name>
-        <rename>disc1_5</rename>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc1_6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc1_7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc1_8</name>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc2_1</name>
-        <rename>disc2_1</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc2_2</name>
-        <rename>disc2_2</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc2_3</name>
-        <rename>disc2_3</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc2_4</name>
-        <rename>disc2_4</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc2_5</name>
-        <rename>disc2_5</rename>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_8</name>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc3_1</name>
-        <rename>disc3_1</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc3_2</name>
-        <rename>disc3_2</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc3_3</name>
-        <rename>disc3_3</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc3_4</name>
-        <rename>disc3_4</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc3_5</name>
-        <rename>disc3_5</rename>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_8</name>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc4_1</name>
-        <rename>disc4_1</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc4_2</name>
-        <rename>disc4_2</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc4_3</name>
-        <rename>disc4_3</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc4_4</name>
-        <rename>disc4_4</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc4_5</name>
-        <rename>disc4_5</rename>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_8</name>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc5_1</name>
-        <rename>disc5_1</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc5_2</name>
-        <rename>disc5_2</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc5_3</name>
-        <rename>disc5_3</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc5_4</name>
-        <rename>disc5_4</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
         <name>disc5_5</name>
-        <rename>disc5_5</rename>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
-    </lookup>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>736</xloc>
-      <yloc>192</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
-  <step>
-    <name>Insert / update 2</name>
-    <type>InsertUpdate</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>dw bi indoteknik (localhost)</connection>
-    <commit>100</commit>
-    <update_bypassed>N</update_bypassed>
-    <lookup>
-      <schema>public</schema>
-      <table>pricelist_compute</table>
-      <key>
-        <name>product_id</name>
-        <field>product_id</field>
-        <condition>=</condition>
-        <name2/>
-      </key>
       <value>
-        <name>product_id</name>
-        <rename>product_id</rename>
-        <update>N</update>
+        <name>disc5_6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_8</name>
+        <rename>zero</rename>
+        <update>Y</update>
       </value>
       <value>
         <name>item_code</name>
@@ -1133,67 +1583,82 @@
         <update>Y</update>
       </value>
       <value>
-        <name>name</name>
-        <rename>name</rename>
+        <name>markup_group1</name>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>pricing_group</name>
-        <rename>pricing_group</rename>
+        <name>markup_group2</name>
+        <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>purchase_price</name>
+        <name>markup_group3</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std1</name>
+        <name>markup_group4</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std2</name>
+        <name>markup_group5</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std3</name>
+        <name>markup_group6</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std4</name>
+        <name>markup_group7</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_std5</name>
+        <name>markup_group8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_group1</name>
+        <name>markup_std1</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_group2</name>
+        <name>markup_std2</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_group3</name>
+        <name>markup_std3</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_group4</name>
+        <name>markup_std4</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>markup_group5</name>
+        <name>markup_std5</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
@@ -1223,6 +1688,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier2_6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier2_7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier2_8</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier3_1</name>
         <rename>zero</rename>
         <update>Y</update>
@@ -1248,6 +1728,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier3_6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier3_7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier3_8</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier4_1</name>
         <rename>zero</rename>
         <update>Y</update>
@@ -1273,6 +1768,21 @@
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier4_6</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier4_7</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier4_8</name>
+        <rename>zero</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier5_1</name>
         <rename>zero</rename>
         <update>Y</update>
@@ -1298,277 +1808,277 @@
         <update>Y</update>
       </value>
       <value>
-        <name>price_after_disc_1</name>
+        <name>markup_tier5_6</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_after_disc_2</name>
+        <name>markup_tier5_7</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_after_disc_3</name>
+        <name>markup_tier5_8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_after_disc_4</name>
-        <rename>zero</rename>
+        <name>name</name>
+        <rename>name</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_after_disc_5</name>
+        <name>price_after_disc_1</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_before_disc1</name>
+        <name>price_after_disc_2</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_before_disc2</name>
+        <name>price_after_disc_3</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_before_disc3</name>
+        <name>price_after_disc_4</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_before_disc4</name>
+        <name>price_after_disc_5</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_before_disc5</name>
+        <name>price_after_disc_6</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier2_1</name>
+        <name>price_after_disc_7</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier2_2</name>
+        <name>price_after_disc_8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier2_3</name>
+        <name>price_before_disc1</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier2_4</name>
+        <name>price_before_disc2</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier2_5</name>
+        <name>price_before_disc3</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier3_1</name>
+        <name>price_before_disc4</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier3_2</name>
+        <name>price_before_disc5</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier3_3</name>
+        <name>price_before_disc6</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier3_4</name>
+        <name>price_before_disc7</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier3_5</name>
+        <name>price_before_disc8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier4_1</name>
+        <name>price_tier2_1</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier4_2</name>
+        <name>price_tier2_2</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier4_3</name>
+        <name>price_tier2_3</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier4_4</name>
+        <name>price_tier2_4</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier4_5</name>
+        <name>price_tier2_5</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier5_1</name>
+        <name>price_tier2_6</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier5_2</name>
+        <name>price_tier2_7</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier5_3</name>
+        <name>price_tier2_8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier5_4</name>
+        <name>price_tier3_1</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>price_tier5_5</name>
+        <name>price_tier3_2</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc1_1</name>
+        <name>price_tier3_3</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc1_2</name>
+        <name>price_tier3_4</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc1_3</name>
+        <name>price_tier3_5</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc1_4</name>
+        <name>price_tier3_6</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc1_5</name>
+        <name>price_tier3_7</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc2_1</name>
+        <name>price_tier3_8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc2_2</name>
+        <name>price_tier4_1</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc2_3</name>
+        <name>price_tier4_2</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc2_4</name>
+        <name>price_tier4_3</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc2_5</name>
+        <name>price_tier4_4</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc3_1</name>
+        <name>price_tier4_5</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc3_2</name>
+        <name>price_tier4_6</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc3_3</name>
+        <name>price_tier4_7</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc3_4</name>
+        <name>price_tier4_8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc3_5</name>
+        <name>price_tier5_1</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc4_1</name>
+        <name>price_tier5_2</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc4_2</name>
+        <name>price_tier5_3</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc4_3</name>
+        <name>price_tier5_4</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc4_4</name>
+        <name>price_tier5_5</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc4_5</name>
+        <name>price_tier5_6</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc5_1</name>
+        <name>price_tier5_7</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc5_2</name>
+        <name>price_tier5_8</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc5_3</name>
-        <rename>zero</rename>
+        <name>pricing_group</name>
+        <rename>pricing_group</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>disc5_4</name>
-        <rename>zero</rename>
-        <update>Y</update>
+        <name>product_id</name>
+        <rename>product_id</rename>
+        <update>N</update>
       </value>
       <value>
-        <name>disc5_5</name>
+        <name>purchase_price</name>
         <rename>zero</rename>
         <update>Y</update>
       </value>
@@ -2578,6 +3088,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>diff1_6</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc6</field_a>
+      <field_b>price_after_disc_6</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff1_7</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc7</field_a>
+      <field_b>price_after_disc7</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff1_8</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc8</field_a>
+      <field_b>price_after_disc8</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>diff2_1</field_name>
       <calc_type>SUBTRACT</calc_type>
       <field_a>price_before_disc1</field_a>
@@ -2653,6 +3208,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>diff2_6</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc6</field_a>
+      <field_b>price_tier2_6</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff2_7</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc7</field_a>
+      <field_b>price_tier2_7</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff2_8</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc8</field_a>
+      <field_b>price_tier2_8</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>diff3_1</field_name>
       <calc_type>SUBTRACT</calc_type>
       <field_a>price_before_disc1</field_a>
@@ -2728,6 +3328,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>diff3_6</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc6</field_a>
+      <field_b>price_tier3_6</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff3_7</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc7</field_a>
+      <field_b>price_tier3_7</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff3_8</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc8</field_a>
+      <field_b>price_tier3_8</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>diff4_1</field_name>
       <calc_type>SUBTRACT</calc_type>
       <field_a>price_before_disc1</field_a>
@@ -2803,6 +3448,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>diff4_6</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc6</field_a>
+      <field_b>price_tier4_6</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff4_7</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc7</field_a>
+      <field_b>price_tier4_7</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff4_8</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc8</field_a>
+      <field_b>price_tier4_8</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>diff5_1</field_name>
       <calc_type>SUBTRACT</calc_type>
       <field_a>price_before_disc1</field_a>
@@ -2877,6 +3567,51 @@ left join brand b on b.id = p.brand_id</sql>
       <grouping_symbol/>
       <currency_symbol/>
     </calculation>
+    <calculation>
+      <field_name>diff5_6</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc6</field_a>
+      <field_b>price_tier5_6</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff5_7</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc7</field_a>
+      <field_b>price_tier5_7</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>diff5_8</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc8</field_a>
+      <field_b>price_tier5_8</field_b>
+      <field_c/>
+      <value_type>None</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
     <attributes/>
     <cluster_schema/>
     <remotesteps>
@@ -2979,6 +3714,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>disc1_6</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff1_6</field_a>
+      <field_b>price_before_disc6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc1_7</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff1_7</field_a>
+      <field_b>price_before_disc7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc1_8</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff1_8</field_a>
+      <field_b>price_before_disc8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>disc2_1</field_name>
       <calc_type>PERCENT_1</calc_type>
       <field_a>diff2_1</field_a>
@@ -3054,6 +3834,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>disc2_6</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff2_6</field_a>
+      <field_b>price_before_disc6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc2_7</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff2_7</field_a>
+      <field_b>price_before_disc7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc2_8</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff2_8</field_a>
+      <field_b>price_before_disc8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>disc3_1</field_name>
       <calc_type>PERCENT_1</calc_type>
       <field_a>diff3_1</field_a>
@@ -3129,6 +3954,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>disc3_6</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff3_6</field_a>
+      <field_b>price_before_disc6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc3_7</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff3_7</field_a>
+      <field_b>price_before_disc7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc3_8</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff3_8</field_a>
+      <field_b>price_before_disc8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>disc4_1</field_name>
       <calc_type>PERCENT_1</calc_type>
       <field_a>diff4_1</field_a>
@@ -3204,6 +4074,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>disc4_6</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff4_6</field_a>
+      <field_b>price_before_disc6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc4_7</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff4_7</field_a>
+      <field_b>price_before_disc7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc4_8</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff4_8</field_a>
+      <field_b>price_before_disc8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>disc5_1</field_name>
       <calc_type>PERCENT_1</calc_type>
       <field_a>diff5_1</field_a>
@@ -3278,6 +4193,51 @@ left join brand b on b.id = p.brand_id</sql>
       <grouping_symbol/>
       <currency_symbol/>
     </calculation>
+    <calculation>
+      <field_name>disc5_6</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff5_6</field_a>
+      <field_b>price_before_disc6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc5_7</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff5_7</field_a>
+      <field_b>price_before_disc7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>disc5_8</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff5_8</field_a>
+      <field_b>price_before_disc8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
     <attributes/>
     <cluster_schema/>
     <remotesteps>
@@ -3379,6 +4339,51 @@ left join brand b on b.id = p.brand_id</sql>
       <grouping_symbol/>
       <currency_symbol/>
     </calculation>
+    <calculation>
+      <field_name>price_after_disc_6</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_std6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_after_disc_7</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_std7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_after_disc_8</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_std8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
     <attributes/>
     <cluster_schema/>
     <remotesteps>
@@ -3481,6 +4486,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_before_disc6</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>price_after_disc_6</field_a>
+      <field_b>markup_group6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_before_disc7</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>price_after_disc_7</field_a>
+      <field_b>markup_group7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_before_disc8</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>price_after_disc_8</field_a>
+      <field_b>markup_group8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>price_tier2_1</field_name>
       <calc_type>PERCENT_3</calc_type>
       <field_a>purchase_price</field_a>
@@ -3556,6 +4606,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_tier2_6</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier2_6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_tier2_7</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier2_7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_tier2_8</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier2_8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>price_tier3_1</field_name>
       <calc_type>PERCENT_3</calc_type>
       <field_a>purchase_price</field_a>
@@ -3631,6 +4726,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_tier3_6</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier3_6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_tier3_7</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier3_7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_tier3_8</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier3_8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>price_tier4_1</field_name>
       <calc_type>PERCENT_3</calc_type>
       <field_a>purchase_price</field_a>
@@ -3706,6 +4846,51 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_tier4_6</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier4_6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_tier4_7</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier4_7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_tier4_8</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier4_8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
       <field_name>price_tier5_1</field_name>
       <calc_type>PERCENT_3</calc_type>
       <field_a>purchase_price</field_a>
@@ -3780,6 +4965,51 @@ left join brand b on b.id = p.brand_id</sql>
       <grouping_symbol/>
       <currency_symbol/>
     </calculation>
+    <calculation>
+      <field_name>price_tier5_6</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier5_6</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_tier5_7</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier5_7</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
+    <calculation>
+      <field_name>price_tier5_8</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier5_8</field_b>
+      <field_c/>
+      <value_type>Number</value_type>
+      <value_length>-1</value_length>
+      <value_precision>-1</value_precision>
+      <remove>N</remove>
+      <conversion_mask/>
+      <decimal_symbol/>
+      <grouping_symbol/>
+      <currency_symbol/>
+    </calculation>
     <attributes/>
     <cluster_schema/>
     <remotesteps>