Merge branch 'master' of https://bitbucket.org/altafixco/transformation-job-bi

1 files changed, 665 insertions, 3 deletions

diff --git a/calculate_price_after_disc.ktr b/calculate_price_after_disc.ktr
index 426b744..eac6ff3 100644
--- a/calculate_price_after_disc.ktr
+++ b/calculate_price_after_disc.ktr
@@ -442,8 +442,8 @@
     <access>Native</access>
     <database>dw_bi_indoteknik</database>
     <port>5432</port>
-    <username>pdi</username>
-    <password>Encrypted 2be989bb20084ca95810197629d9ea18e</password>
+    <username>odoo</username>
+    <password>Encrypted 2be98afc82bdfd8dd9a2ca45acc83f6c3</password>
     <servername/>
     <data_tablespace/>
     <index_tablespace/>
@@ -658,6 +658,8 @@ coalesce((
 (select group6 from price_group_dw pgd where id = 2) as markup_std6,
 (select group7 from price_group_dw pgd where id = 2) as markup_std7,
 (select group8 from price_group_dw pgd where id = 2) as markup_std8,
+(select group9 from price_group_dw pgd where id = 2) as markup_std9,--new
+(select group10 from price_group_dw pgd where id = 2) as markup_std10,--new
 (select group1 from price_group_dw pgd where id = 1) as markup_group1,
 (select group2 from price_group_dw pgd where id = 1) as markup_group2,
 (select group3 from price_group_dw pgd where id = 1) as markup_group3,
@@ -666,6 +668,8 @@ coalesce((
 (select group6 from price_group_dw pgd where id = 1) as markup_group6,
 (select group7 from price_group_dw pgd where id = 1) as markup_group7,
 (select group8 from price_group_dw pgd where id = 1) as markup_group8,
+(select group9 from price_group_dw pgd where id = 1) as markup_group9,--new
+(select group10 from price_group_dw pgd where id = 1) as markup_group10,--new
 (select group1 from price_group_dw pgd where id = 3) as markup_tier2_1,
 (select group2 from price_group_dw pgd where id = 3) as markup_tier2_2,
 (select group3 from price_group_dw pgd where id = 3) as markup_tier2_3,
@@ -674,6 +678,8 @@ coalesce((
 (select group6 from price_group_dw pgd where id = 3) as markup_tier2_6,
 (select group7 from price_group_dw pgd where id = 3) as markup_tier2_7,
 (select group8 from price_group_dw pgd where id = 3) as markup_tier2_8,
+(select group9 from price_group_dw pgd where id = 3) as markup_tier2_9,--new
+(select group10 from price_group_dw pgd where id = 3) as markup_tier2_10,--new
 (select group1 from price_group_dw pgd where id = 4) as markup_tier3_1,
 (select group2 from price_group_dw pgd where id = 4) as markup_tier3_2,
 (select group3 from price_group_dw pgd where id = 4) as markup_tier3_3,
@@ -682,6 +688,8 @@ coalesce((
 (select group6 from price_group_dw pgd where id = 4) as markup_tier3_6,
 (select group7 from price_group_dw pgd where id = 4) as markup_tier3_7,
 (select group8 from price_group_dw pgd where id = 4) as markup_tier3_8,
+(select group9 from price_group_dw pgd where id = 4) as markup_tier3_9,--new
+(select group10 from price_group_dw pgd where id = 4) as markup_tier3_10,--new
 (select group1 from price_group_dw pgd where id = 5) as markup_tier4_1,
 (select group2 from price_group_dw pgd where id = 5) as markup_tier4_2,
 (select group3 from price_group_dw pgd where id = 5) as markup_tier4_3,
@@ -690,6 +698,8 @@ coalesce((
 (select group6 from price_group_dw pgd where id = 5) as markup_tier4_6,
 (select group7 from price_group_dw pgd where id = 5) as markup_tier4_7,
 (select group8 from price_group_dw pgd where id = 5) as markup_tier4_8,
+(select group9 from price_group_dw pgd where id = 5) as markup_tier4_9,--new
+(select group10 from price_group_dw pgd where id = 5) as markup_tier4_10,--new
 (select group1 from price_group_dw pgd where id = 6) as markup_tier5_1,
 (select group2 from price_group_dw pgd where id = 6) as markup_tier5_2,
 (select group3 from price_group_dw pgd where id = 6) as markup_tier5_3,
@@ -697,7 +707,9 @@ coalesce((
 (select group5 from price_group_dw pgd where id = 6) as markup_tier5_5,
 (select group6 from price_group_dw pgd where id = 6) as markup_tier5_6,
 (select group7 from price_group_dw pgd where id = 6) as markup_tier5_7,
-(select group8 from price_group_dw pgd where id = 6) as markup_tier5_8
+(select group8 from price_group_dw pgd where id = 6) as markup_tier5_8,
+(select group9 from price_group_dw pgd where id = 6) as markup_tier5_9,--new
+(select group10 from price_group_dw pgd where id = 6) as markup_tier5_10--new
 from product p
 left join brand b on b.id = p.brand_id</sql>
     <limit>0</limit>
@@ -2120,6 +2132,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>diff1_9</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc9</field_a>
+      <field_b>price_after_disc_9</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_10</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc10</field_a>
+      <field_b>price_after_disc_10</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>
@@ -2240,6 +2282,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>diff2_9</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc9</field_a>
+      <field_b>price_tier2_9</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_10</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc10</field_a>
+      <field_b>price_tier2_10</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>
@@ -2360,6 +2432,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>diff3_9</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc9</field_a>
+      <field_b>price_tier3_9</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_10</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc10</field_a>
+      <field_b>price_tier3_10</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>
@@ -2480,6 +2582,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>diff4_9</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc9</field_a>
+      <field_b>price_tier4_9</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_10</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc10</field_a>
+      <field_b>price_tier4_10</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>
@@ -2599,6 +2731,36 @@ left join brand b on b.id = p.brand_id</sql>
       <grouping_symbol/>
       <currency_symbol/>
     </calculation>
+    <calculation>
+      <field_name>diff5_9</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc9</field_a>
+      <field_b>price_tier5_9</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_10</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>price_before_disc10</field_a>
+      <field_b>price_tier5_10</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>
@@ -2746,6 +2908,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>disc1_9</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff1_9</field_a>
+      <field_b>price_before_disc9</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_10</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff1_10</field_a>
+      <field_b>price_before_disc10</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>
@@ -2866,6 +3058,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>disc2_9</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff2_9</field_a>
+      <field_b>price_before_disc9</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_10</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff2_10</field_a>
+      <field_b>price_before_disc10</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>
@@ -2986,6 +3208,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>disc3_9</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff3_9</field_a>
+      <field_b>price_before_disc9</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_10</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff3_10</field_a>
+      <field_b>price_before_disc10</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>
@@ -3106,6 +3358,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>disc4_9</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff4_9</field_a>
+      <field_b>price_before_disc9</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_10</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff4_10</field_a>
+      <field_b>price_before_disc10</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>
@@ -3225,6 +3507,36 @@ left join brand b on b.id = p.brand_id</sql>
       <grouping_symbol/>
       <currency_symbol/>
     </calculation>
+    <calculation>
+      <field_name>disc5_9</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff5_9</field_a>
+      <field_b>price_before_disc9</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_10</field_name>
+      <calc_type>PERCENT_1</calc_type>
+      <field_a>diff5_10</field_a>
+      <field_b>price_before_disc10</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>
@@ -3372,6 +3684,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_before_disc9</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_group9</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_disc10</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_group10</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_1</field_name>
       <calc_type>PERCENT_3</calc_type>
       <field_a>purchase_price</field_a>
@@ -3492,6 +3834,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_after_disc_9</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_std9</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_10</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_std10</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>
@@ -3612,6 +3984,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_tier2_9</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier2_9</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_10</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier2_10</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>
@@ -3732,6 +4134,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_tier3_9</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier3_9</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_10</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier3_10</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>
@@ -3852,6 +4284,36 @@ left join brand b on b.id = p.brand_id</sql>
       <currency_symbol/>
     </calculation>
     <calculation>
+      <field_name>price_tier4_9</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier4_9</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_10</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier4_10</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>
@@ -3971,6 +4433,36 @@ left join brand b on b.id = p.brand_id</sql>
       <grouping_symbol/>
       <currency_symbol/>
     </calculation>
+    <calculation>
+      <field_name>price_tier5_9</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier5_9</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_10</field_name>
+      <calc_type>PERCENT_3</calc_type>
+      <field_a>purchase_price</field_a>
+      <field_b>markup_tier5_10</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>
@@ -4049,6 +4541,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>disc1_9</name>
+        <rename>disc1_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc1_10</name>
+        <rename>disc1_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>disc2_1</name>
         <rename>disc2_1</rename>
         <update>Y</update>
@@ -4089,6 +4591,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>disc2_9</name>
+        <rename>disc2_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc2_10</name>
+        <rename>disc2_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>disc3_1</name>
         <rename>disc3_1</rename>
         <update>Y</update>
@@ -4129,6 +4641,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>disc3_9</name>
+        <rename>disc3_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc3_10</name>
+        <rename>disc3_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>disc4_1</name>
         <rename>disc4_1</rename>
         <update>Y</update>
@@ -4169,6 +4691,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>disc4_9</name>
+        <rename>disc4_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc4_10</name>
+        <rename>disc4_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>disc5_1</name>
         <rename>disc5_1</rename>
         <update>Y</update>
@@ -4209,6 +4741,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>disc5_9</name>
+        <rename>disc5_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>disc5_10</name>
+        <rename>disc5_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>item_code</name>
         <rename>item_code</rename>
         <update>Y</update>
@@ -4254,6 +4796,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>markup_group9</name>
+        <rename>markup_group9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_group10</name>
+        <rename>markup_group10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_std1</name>
         <rename>markup_std1</rename>
         <update>Y</update>
@@ -4294,6 +4846,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>markup_std9</name>
+        <rename>markup_std9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_std10</name>
+        <rename>markup_std10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier2_1</name>
         <rename>markup_tier2_1</rename>
         <update>Y</update>
@@ -4334,6 +4896,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier2_9</name>
+        <rename>markup_tier2_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier2_10</name>
+        <rename>markup_tier2_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier3_1</name>
         <rename>markup_tier3_1</rename>
         <update>Y</update>
@@ -4374,6 +4946,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier3_9</name>
+        <rename>markup_tier3_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier3_10</name>
+        <rename>markup_tier3_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier4_1</name>
         <rename>markup_tier4_1</rename>
         <update>Y</update>
@@ -4414,6 +4996,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier4_9</name>
+        <rename>markup_tier4_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier4_10</name>
+        <rename>markup_tier4_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>markup_tier5_1</name>
         <rename>markup_tier5_1</rename>
         <update>Y</update>
@@ -4454,6 +5046,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>markup_tier5_9</name>
+        <rename>markup_tier5_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>markup_tier5_10</name>
+        <rename>markup_tier5_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>name</name>
         <rename>name</rename>
         <update>Y</update>
@@ -4499,6 +5101,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>price_after_disc_9</name>
+        <rename>price_after_disc_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_after_disc_10</name>
+        <rename>price_after_disc_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_before_disc1</name>
         <rename>price_before_disc1</rename>
         <update>Y</update>
@@ -4539,6 +5151,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>price_before_disc9</name>
+        <rename>price_before_disc9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_before_disc10</name>
+        <rename>price_before_disc10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_tier2_1</name>
         <rename>price_tier2_1</rename>
         <update>Y</update>
@@ -4579,6 +5201,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>price_tier2_9</name>
+        <rename>price_tier2_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier2_10</name>
+        <rename>price_tier2_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_tier3_1</name>
         <rename>price_tier3_1</rename>
         <update>Y</update>
@@ -4619,6 +5251,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>price_tier3_9</name>
+        <rename>price_tier3_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier3_10</name>
+        <rename>price_tier3_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_tier4_1</name>
         <rename>price_tier4_1</rename>
         <update>Y</update>
@@ -4659,6 +5301,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>price_tier4_9</name>
+        <rename>price_tier4_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier4_10</name>
+        <rename>price_tier4_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>price_tier5_1</name>
         <rename>price_tier5_1</rename>
         <update>Y</update>
@@ -4699,6 +5351,16 @@ left join brand b on b.id = p.brand_id</sql>
         <update>Y</update>
       </value>
       <value>
+        <name>price_tier5_9</name>
+        <rename>price_tier5_9</rename>
+        <update>Y</update>
+      </value>
+      <value>
+        <name>price_tier5_10</name>
+        <rename>price_tier5_10</rename>
+        <update>Y</update>
+      </value>
+      <value>
         <name>pricing_group</name>
         <rename>pricing_group</rename>
         <update>Y</update>