diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2026-01-31 10:28:12 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2026-01-31 10:28:12 +0700 |
| commit | 21cbbf984faf05679bbc73af50d3e02a7128800b (patch) | |
| tree | 90f291bfa9863f38c90b5066b5fd99a645a137a2 | |
| parent | 1eebb8c2cbd3b79e4a9385653fb82433168d032e (diff) | |
bf error diff2_10 on calculation
| -rw-r--r-- | calculate_price_after_disc.ktr | 654 | ||||
| -rw-r--r-- | update_override_vendor_pricelist.ktr | 3142 |
2 files changed, 2121 insertions, 1675 deletions
diff --git a/calculate_price_after_disc.ktr b/calculate_price_after_disc.ktr index eac6ff3..36bf708 100644 --- a/calculate_price_after_disc.ktr +++ b/calculate_price_after_disc.ktr @@ -493,16 +493,6 @@ <enabled>Y</enabled> </hop> <hop> - <from>calculate diff</from> - <to>calculate discount</to> - <enabled>Y</enabled> - </hop> - <hop> - <from>calculate discount</from> - <to>dw Insert / update calc pl</to> - <enabled>Y</enabled> - </hop> - <hop> <from>Table input</from> <to>Filter rows</to> <enabled>Y</enabled> @@ -522,6 +512,16 @@ <to>calculate price tier</to> <enabled>Y</enabled> </hop> + <hop> + <from>calculate diff</from> + <to>calculate discount</to> + <enabled>Y</enabled> + </hop> + <hop> + <from>calculate discount</from> + <to>dw Insert / update calc pl</to> + <enabled>Y</enabled> + </hop> </order> <step> <name>Add constants</name> @@ -738,7 +738,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -761,7 +761,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -784,7 +784,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -807,7 +807,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -830,7 +830,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -853,7 +853,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -876,7 +876,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -899,7 +899,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -922,7 +922,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -945,7 +945,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -968,7 +968,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -991,7 +991,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1014,7 +1014,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1037,7 +1037,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1060,7 +1060,53 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_std9</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_std9</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_std10</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_std10</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1083,7 +1129,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1106,7 +1152,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1129,7 +1175,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1152,7 +1198,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1175,7 +1221,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1198,7 +1244,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1221,7 +1267,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1244,7 +1290,53 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_group9</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_group9</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_group10</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_group10</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1267,7 +1359,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1290,7 +1382,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1313,7 +1405,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1336,7 +1428,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1359,7 +1451,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1382,7 +1474,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1405,7 +1497,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1428,7 +1520,53 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_tier2_9</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_tier2_9</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_tier2_10</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_tier2_10</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1451,7 +1589,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1474,7 +1612,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1497,7 +1635,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1520,7 +1658,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1543,7 +1681,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1566,7 +1704,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1589,7 +1727,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1612,7 +1750,53 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_tier3_9</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_tier3_9</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_tier3_10</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_tier3_10</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1635,7 +1819,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1658,7 +1842,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1681,7 +1865,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1704,7 +1888,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1727,7 +1911,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1750,7 +1934,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1773,7 +1957,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1796,7 +1980,53 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_tier4_9</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_tier4_9</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_tier4_10</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_tier4_10</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1819,7 +2049,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1842,7 +2072,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1865,7 +2095,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1888,7 +2118,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1911,7 +2141,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1934,7 +2164,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1957,7 +2187,7 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -1980,7 +2210,53 @@ left join brand b on b.id = p.brand_id</sql> <sort_descending>N</sort_descending> <output_padding>N</output_padding> <date_format_lenient>N</date_format_lenient> - <date_format_locale>en_ID</date_format_locale> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_tier5_9</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_tier5_9</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> + <date_format_timezone>Asia/Bangkok</date_format_timezone> + <lenient_string_to_number>N</lenient_string_to_number> + </value-meta> + <value-meta> + <type>BigNumber</type> + <storagetype>normal</storagetype> + <name>markup_tier5_10</name> + <length>-1</length> + <precision>-1</precision> + <origin>Table input</origin> + <comments>markup_tier5_10</comments> + <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask> + <decimal_symbol>.</decimal_symbol> + <grouping_symbol/> + <currency_symbol/> + <trim_type>none</trim_type> + <case_insensitive>N</case_insensitive> + <collator_disabled>Y</collator_disabled> + <collator_strength>0</collator_strength> + <sort_descending>N</sort_descending> + <output_padding>N</output_padding> + <date_format_lenient>N</date_format_lenient> + <date_format_locale>en_US</date_format_locale> <date_format_timezone>Asia/Bangkok</date_format_timezone> <lenient_string_to_number>N</lenient_string_to_number> </value-meta> @@ -2027,6 +2303,21 @@ left join brand b on b.id = p.brand_id</sql> <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>diff1_2</field_name> <calc_type>SUBTRACT</calc_type> <field_a>price_before_disc2</field_a> @@ -2147,10 +2438,10 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff1_10</field_name> + <field_name>diff2_1</field_name> <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc10</field_a> - <field_b>price_after_disc_10</field_b> + <field_a>price_before_disc1</field_a> + <field_b>price_tier2_1</field_b> <field_c/> <value_type>None</value_type> <value_length>-1</value_length> @@ -2162,10 +2453,10 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff2_1</field_name> + <field_name>diff2_10</field_name> <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_tier2_1</field_b> + <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> @@ -2297,10 +2588,10 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff3_10</field_name> + <field_name>diff3_1</field_name> <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc10</field_a> - <field_b>price_tier2_10</field_b> + <field_a>price_before_disc1</field_a> + <field_b>price_tier3_1</field_b> <field_c/> <value_type>None</value_type> <value_length>-1</value_length> @@ -2312,10 +2603,10 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff3_1</field_name> + <field_name>diff3_10</field_name> <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_tier3_1</field_b> + <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> @@ -2447,10 +2738,10 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff3_10</field_name> + <field_name>diff4_1</field_name> <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc10</field_a> - <field_b>price_tier3_10</field_b> + <field_a>price_before_disc1</field_a> + <field_b>price_tier4_1</field_b> <field_c/> <value_type>None</value_type> <value_length>-1</value_length> @@ -2462,10 +2753,10 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff4_1</field_name> + <field_name>diff4_10</field_name> <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_tier4_1</field_b> + <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> @@ -2597,10 +2888,10 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff4_10</field_name> + <field_name>diff5_1</field_name> <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc10</field_a> - <field_b>price_tier4_10</field_b> + <field_a>price_before_disc1</field_a> + <field_b>price_tier5_1</field_b> <field_c/> <value_type>None</value_type> <value_length>-1</value_length> @@ -2612,10 +2903,10 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff5_1</field_name> + <field_name>diff5_10</field_name> <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_tier5_1</field_b> + <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> @@ -2746,21 +3037,6 @@ left join brand b on b.id = p.brand_id</sql> <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> @@ -5464,6 +5740,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc1_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>disc1_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>disc2_1</name> <rename>zero</rename> <update>Y</update> @@ -5504,6 +5790,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc2_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>disc2_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>disc3_1</name> <rename>zero</rename> <update>Y</update> @@ -5544,6 +5840,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc3_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>disc3_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>disc4_1</name> <rename>zero</rename> <update>Y</update> @@ -5584,6 +5890,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc4_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>disc4_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>disc5_1</name> <rename>zero</rename> <update>Y</update> @@ -5624,6 +5940,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc5_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>disc5_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>item_code</name> <rename>item_code</rename> <update>Y</update> @@ -5669,6 +5995,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_group9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>markup_group10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>markup_std1</name> <rename>zero</rename> <update>Y</update> @@ -5709,6 +6045,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_std9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>markup_std10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>markup_tier2_1</name> <rename>zero</rename> <update>Y</update> @@ -5749,6 +6095,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_tier2_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>markup_tier2_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>markup_tier3_1</name> <rename>zero</rename> <update>Y</update> @@ -5789,6 +6145,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_tier3_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>markup_tier3_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>markup_tier4_1</name> <rename>zero</rename> <update>Y</update> @@ -5829,6 +6195,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_tier4_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>markup_tier4_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>markup_tier5_1</name> <rename>zero</rename> <update>Y</update> @@ -5869,6 +6245,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_tier5_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>markup_tier5_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>name</name> <rename>name</rename> <update>Y</update> @@ -5914,6 +6300,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_after_disc_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>price_after_disc_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>price_before_disc1</name> <rename>zero</rename> <update>Y</update> @@ -5954,6 +6350,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_before_disc9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>price_before_disc10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>price_tier2_1</name> <rename>zero</rename> <update>Y</update> @@ -5994,6 +6400,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_tier2_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>price_tier2_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>price_tier3_1</name> <rename>zero</rename> <update>Y</update> @@ -6034,6 +6450,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_tier3_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>price_tier3_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>price_tier4_1</name> <rename>zero</rename> <update>Y</update> @@ -6074,6 +6500,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_tier4_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>price_tier4_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>price_tier5_1</name> <rename>zero</rename> <update>Y</update> @@ -6114,6 +6550,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_tier5_9</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> + <name>price_tier5_10</name> + <rename>zero</rename> + <update>Y</update> + </value> + <value> <name>pricing_group</name> <rename>pricing_group</rename> <update>Y</update> diff --git a/update_override_vendor_pricelist.ktr b/update_override_vendor_pricelist.ktr index 6264815..d08bc52 100644 --- a/update_override_vendor_pricelist.ktr +++ b/update_override_vendor_pricelist.ktr @@ -1914,784 +1914,7 @@ where b.purchase_price_exist = 'Y'</sql> </GUI> </step> <step> - <name>filter override vendor purchase price = 0</name> - <type>WriteToLog</type> - <description/> - <distribute>Y</distribute> - <custom_distribution/> - <copies>1</copies> - <partitioning> - <method>none</method> - <schema_name/> - </partitioning> - <loglevel>log_level_basic</loglevel> - <displayHeader>Y</displayHeader> - <limitRows>N</limitRows> - <limitRowsNumber>0</limitRowsNumber> - <logmessage/> - <fields> - </fields> - <attributes/> - <cluster_schema/> - <remotesteps> - <input> - </input> - <output> - </output> - </remotesteps> - <GUI> - <xloc>352</xloc> - <yloc>256</yloc> - <draw>Y</draw> - </GUI> - </step> - <step> - <name>update purchase pricelist override vendor</name> - <type>Update</type> - <description/> - <distribute>Y</distribute> - <custom_distribution/> - <copies>1</copies> - <partitioning> - <method>none</method> - <schema_name/> - </partitioning> - <connection>dw bi indoteknik (localhost)</connection> - <skip_lookup>N</skip_lookup> - <commit>100</commit> - <use_batch>N</use_batch> - <error_ignored>N</error_ignored> - <ignore_flag_field/> - <lookup> - <schema>public</schema> - <table>pricelist_compute</table> - <key> - <name>product_id</name> - <field>product_id</field> - <condition>=</condition> - <name2/> - </key> - <value> - <name>item_code</name> - <rename>item_code</rename> - </value> - <value> - <name>name</name> - <rename>name</rename> - </value> - <value> - <name>pricing_group</name> - <rename>pricing_group</rename> - </value> - <value> - <name>purchase_price</name> - <rename>purchase_price</rename> - </value> - <value> - <name>vendor</name> - <rename>vendor</rename> - </value> - <value> - <name>markup_std1</name> - <rename>markup_std1</rename> - </value> - <value> - <name>markup_std2</name> - <rename>markup_std2</rename> - </value> - <value> - <name>markup_std3</name> - <rename>markup_std3</rename> - </value> - <value> - <name>markup_std4</name> - <rename>markup_std4</rename> - </value> - <value> - <name>markup_std5</name> - <rename>markup_std5</rename> - </value> - <value> - <name>markup_std6</name> - <rename>markup_std6</rename> - </value> - <value> - <name>markup_std7</name> - <rename>markup_std7</rename> - </value> - <value> - <name>markup_std8</name> - <rename>markup_std8</rename> - </value> - <value> - <name>markup_std9</name> - <rename>markup_std9</rename> - </value> - <value> - <name>markup_std10</name> - <rename>markup_std10</rename> - </value> - <value> - <name>markup_group1</name> - <rename>markup_group1</rename> - </value> - <value> - <name>markup_group2</name> - <rename>markup_group2</rename> - </value> - <value> - <name>markup_group3</name> - <rename>markup_group3</rename> - </value> - <value> - <name>markup_group4</name> - <rename>markup_group4</rename> - </value> - <value> - <name>markup_group5</name> - <rename>markup_group5</rename> - </value> - <value> - <name>markup_group6</name> - <rename>markup_group6</rename> - </value> - <value> - <name>markup_group7</name> - <rename>markup_group7</rename> - </value> - <value> - <name>markup_group8</name> - <rename>markup_group8</rename> - </value> - <value> - <name>markup_group9</name> - <rename>markup_group9</rename> - </value> - <value> - <name>markup_group10</name> - <rename>markup_group10</rename> - </value> - <value> - <name>markup_tier2_1</name> - <rename>markup_tier2_1</rename> - </value> - <value> - <name>markup_tier2_2</name> - <rename>markup_tier2_2</rename> - </value> - <value> - <name>markup_tier2_3</name> - <rename>markup_tier2_3</rename> - </value> - <value> - <name>markup_tier2_4</name> - <rename>markup_tier2_4</rename> - </value> - <value> - <name>markup_tier2_5</name> - <rename>markup_tier2_5</rename> - </value> - <value> - <name>markup_tier2_6</name> - <rename>markup_tier2_6</rename> - </value> - <value> - <name>markup_tier2_7</name> - <rename>markup_tier2_7</rename> - </value> - <value> - <name>markup_tier2_8</name> - <rename>markup_tier2_8</rename> - </value> - <value> - <name>markup_tier2_9</name> - <rename>markup_tier2_9</rename> - </value> - <value> - <name>markup_tier2_10</name> - <rename>markup_tier2_10</rename> - </value> - <value> - <name>markup_tier3_1</name> - <rename>markup_tier3_1</rename> - </value> - <value> - <name>markup_tier3_2</name> - <rename>markup_tier3_2</rename> - </value> - <value> - <name>markup_tier3_3</name> - <rename>markup_tier3_3</rename> - </value> - <value> - <name>markup_tier3_4</name> - <rename>markup_tier3_4</rename> - </value> - <value> - <name>markup_tier3_5</name> - <rename>markup_tier3_5</rename> - </value> - <value> - <name>markup_tier3_6</name> - <rename>markup_tier3_6</rename> - </value> - <value> - <name>markup_tier3_7</name> - <rename>markup_tier3_7</rename> - </value> - <value> - <name>markup_tier3_8</name> - <rename>markup_tier3_8</rename> - </value> - <value> - <name>markup_tier3_9</name> - <rename>markup_tier3_9</rename> - </value> - <value> - <name>markup_tier3_10</name> - <rename>markup_tier3_10</rename> - </value> - <value> - <name>markup_tier4_1</name> - <rename>markup_tier4_1</rename> - </value> - <value> - <name>markup_tier4_2</name> - <rename>markup_tier4_2</rename> - </value> - <value> - <name>markup_tier4_3</name> - <rename>markup_tier4_3</rename> - </value> - <value> - <name>markup_tier4_4</name> - <rename>markup_tier4_4</rename> - </value> - <value> - <name>markup_tier4_5</name> - <rename>markup_tier4_5</rename> - </value> - <value> - <name>markup_tier4_6</name> - <rename>markup_tier4_6</rename> - </value> - <value> - <name>markup_tier4_7</name> - <rename>markup_tier4_7</rename> - </value> - <value> - <name>markup_tier4_8</name> - <rename>markup_tier4_8</rename> - </value> - <value> - <name>markup_tier4_9</name> - <rename>markup_tier4_9</rename> - </value> - <value> - <name>markup_tier4_10</name> - <rename>markup_tier4_10</rename> - </value> - <value> - <name>markup_tier5_1</name> - <rename>markup_tier5_1</rename> - </value> - <value> - <name>markup_tier5_2</name> - <rename>markup_tier5_2</rename> - </value> - <value> - <name>markup_tier5_3</name> - <rename>markup_tier5_3</rename> - </value> - <value> - <name>markup_tier5_4</name> - <rename>markup_tier5_4</rename> - </value> - <value> - <name>markup_tier5_5</name> - <rename>markup_tier5_5</rename> - </value> - <value> - <name>markup_tier5_6</name> - <rename>markup_tier5_6</rename> - </value> - <value> - <name>markup_tier5_7</name> - <rename>markup_tier5_7</rename> - </value> - <value> - <name>markup_tier5_8</name> - <rename>markup_tier5_8</rename> - </value> - <value> - <name>markup_tier5_9</name> - <rename>markup_tier5_9</rename> - </value> - <value> - <name>markup_tier5_10</name> - <rename>markup_tier5_10</rename> - </value> - <value> - <name>price_before_disc1</name> - <rename>price_before_disc1</rename> - </value> - <value> - <name>price_before_disc2</name> - <rename>price_before_disc2</rename> - </value> - <value> - <name>price_before_disc3</name> - <rename>price_before_disc3</rename> - </value> - <value> - <name>price_before_disc4</name> - <rename>price_before_disc4</rename> - </value> - <value> - <name>price_before_disc5</name> - <rename>price_before_disc5</rename> - </value> - <value> - <name>price_before_disc6</name> - <rename>price_before_disc6</rename> - </value> - <value> - <name>price_before_disc7</name> - <rename>price_before_disc7</rename> - </value> - <value> - <name>price_before_disc8</name> - <rename>price_before_disc8</rename> - </value> - <value> - <name>price_before_disc9</name> - <rename>price_before_disc9</rename> - </value> - <value> - <name>price_before_disc10</name> - <rename>price_before_disc10</rename> - </value> - <value> - <name>price_after_disc_1</name> - <rename>price_after_disc_1</rename> - </value> - <value> - <name>price_after_disc_2</name> - <rename>price_after_disc_2</rename> - </value> - <value> - <name>price_after_disc_3</name> - <rename>price_after_disc_3</rename> - </value> - <value> - <name>price_after_disc_4</name> - <rename>price_after_disc_4</rename> - </value> - <value> - <name>price_after_disc_5</name> - <rename>price_after_disc_5</rename> - </value> - <value> - <name>price_after_disc_6</name> - <rename>price_after_disc_6</rename> - </value> - <value> - <name>price_after_disc_7</name> - <rename>price_after_disc_7</rename> - </value> - <value> - <name>price_after_disc_8</name> - <rename>price_after_disc_8</rename> - </value> - <value> - <name>price_after_disc_9</name> - <rename>price_after_disc_9</rename> - </value> - <value> - <name>price_after_disc_10</name> - <rename>price_after_disc_10</rename> - </value> - <value> - <name>price_tier2_1</name> - <rename>price_tier2_1</rename> - </value> - <value> - <name>price_tier2_2</name> - <rename>price_tier2_2</rename> - </value> - <value> - <name>price_tier2_3</name> - <rename>price_tier2_3</rename> - </value> - <value> - <name>price_tier2_4</name> - <rename>price_tier2_4</rename> - </value> - <value> - <name>price_tier2_5</name> - <rename>price_tier2_5</rename> - </value> - <value> - <name>price_tier2_6</name> - <rename>price_tier2_6</rename> - </value> - <value> - <name>price_tier2_7</name> - <rename>price_tier2_7</rename> - </value> - <value> - <name>price_tier2_8</name> - <rename>price_tier2_8</rename> - </value> - <value> - <name>price_tier2_9</name> - <rename>price_tier2_9</rename> - </value> - <value> - <name>price_tier2_10</name> - <rename>price_tier2_10</rename> - </value> - <value> - <name>price_tier3_1</name> - <rename>price_tier3_1</rename> - </value> - <value> - <name>price_tier3_2</name> - <rename>price_tier3_2</rename> - </value> - <value> - <name>price_tier3_3</name> - <rename>price_tier3_3</rename> - </value> - <value> - <name>price_tier3_4</name> - <rename>price_tier3_4</rename> - </value> - <value> - <name>price_tier3_5</name> - <rename>price_tier3_5</rename> - </value> - <value> - <name>price_tier3_6</name> - <rename>price_tier3_6</rename> - </value> - <value> - <name>price_tier3_7</name> - <rename>price_tier3_7</rename> - </value> - <value> - <name>price_tier3_8</name> - <rename>price_tier3_8</rename> - </value> - <value> - <name>price_tier3_9</name> - <rename>price_tier3_9</rename> - </value> - <value> - <name>price_tier3_10</name> - <rename>price_tier3_10</rename> - </value> - <value> - <name>price_tier4_1</name> - <rename>price_tier4_1</rename> - </value> - <value> - <name>price_tier4_2</name> - <rename>price_tier4_2</rename> - </value> - <value> - <name>price_tier4_3</name> - <rename>price_tier4_3</rename> - </value> - <value> - <name>price_tier4_4</name> - <rename>price_tier4_4</rename> - </value> - <value> - <name>price_tier4_5</name> - <rename>price_tier4_5</rename> - </value> - <value> - <name>price_tier4_6</name> - <rename>price_tier4_6</rename> - </value> - <value> - <name>price_tier4_7</name> - <rename>price_tier4_7</rename> - </value> - <value> - <name>price_tier4_8</name> - <rename>price_tier4_8</rename> - </value> - <value> - <name>price_tier4_9</name> - <rename>price_tier4_9</rename> - </value> - <value> - <name>price_tier4_10</name> - <rename>price_tier4_10</rename> - </value> - <value> - <name>price_tier5_1</name> - <rename>price_tier5_1</rename> - </value> - <value> - <name>price_tier5_2</name> - <rename>price_tier5_2</rename> - </value> - <value> - <name>price_tier5_3</name> - <rename>price_tier5_3</rename> - </value> - <value> - <name>price_tier5_4</name> - <rename>price_tier5_4</rename> - </value> - <value> - <name>price_tier5_5</name> - <rename>price_tier5_5</rename> - </value> - <value> - <name>price_tier5_6</name> - <rename>price_tier5_6</rename> - </value> - <value> - <name>price_tier5_7</name> - <rename>price_tier5_7</rename> - </value> - <value> - <name>price_tier5_8</name> - <rename>price_tier5_8</rename> - </value> - <value> - <name>price_tier5_9</name> - <rename>price_tier5_9</rename> - </value> - <value> - <name>price_tier5_10</name> - <rename>price_tier5_10</rename> - </value> - <value> - <name>disc1_1</name> - <rename>disc1_1</rename> - </value> - <value> - <name>disc1_2</name> - <rename>disc1_2</rename> - </value> - <value> - <name>disc1_3</name> - <rename>disc1_3</rename> - </value> - <value> - <name>disc1_4</name> - <rename>disc1_4</rename> - </value> - <value> - <name>disc1_5</name> - <rename>disc1_5</rename> - </value> - <value> - <name>disc1_6</name> - <rename>disc1_6</rename> - </value> - <value> - <name>disc1_7</name> - <rename>disc1_7</rename> - </value> - <value> - <name>disc1_8</name> - <rename>disc1_8</rename> - </value> - <value> - <name>disc1_9</name> - <rename>disc1_9</rename> - </value> - <value> - <name>disc1_10</name> - <rename>disc1_10</rename> - </value> - <value> - <name>disc2_1</name> - <rename>disc2_1</rename> - </value> - <value> - <name>disc2_2</name> - <rename>disc2_2</rename> - </value> - <value> - <name>disc2_3</name> - <rename>disc2_3</rename> - </value> - <value> - <name>disc2_4</name> - <rename>disc2_4</rename> - </value> - <value> - <name>disc2_5</name> - <rename>disc2_5</rename> - </value> - <value> - <name>disc2_6</name> - <rename>disc2_6</rename> - </value> - <value> - <name>disc2_7</name> - <rename>disc2_7</rename> - </value> - <value> - <name>disc2_8</name> - <rename>disc2_8</rename> - </value> - <value> - <name>disc2_9</name> - <rename>disc2_9</rename> - </value> - <value> - <name>disc2_10</name> - <rename>disc2_10</rename> - </value> - <value> - <name>disc3_1</name> - <rename>disc3_1</rename> - </value> - <value> - <name>disc3_2</name> - <rename>disc3_2</rename> - </value> - <value> - <name>disc3_3</name> - <rename>disc3_3</rename> - </value> - <value> - <name>disc3_4</name> - <rename>disc3_4</rename> - </value> - <value> - <name>disc3_5</name> - <rename>disc3_5</rename> - </value> - <value> - <name>disc3_6</name> - <rename>disc3_6</rename> - </value> - <value> - <name>disc3_7</name> - <rename>disc3_7</rename> - </value> - <value> - <name>disc3_8</name> - <rename>disc3_8</rename> - </value> - <value> - <name>disc3_9</name> - <rename>disc3_9</rename> - </value> - <value> - <name>disc3_10</name> - <rename>disc3_10</rename> - </value> - <value> - <name>disc4_1</name> - <rename>disc4_1</rename> - </value> - <value> - <name>disc4_2</name> - <rename>disc4_2</rename> - </value> - <value> - <name>disc4_3</name> - <rename>disc4_3</rename> - </value> - <value> - <name>disc4_4</name> - <rename>disc4_4</rename> - </value> - <value> - <name>disc4_5</name> - <rename>disc4_5</rename> - </value> - <value> - <name>disc4_6</name> - <rename>disc4_6</rename> - </value> - <value> - <name>disc4_7</name> - <rename>disc4_7</rename> - </value> - <value> - <name>disc4_8</name> - <rename>disc4_8</rename> - </value> - <value> - <name>disc4_9</name> - <rename>disc4_9</rename> - </value> - <value> - <name>disc4_10</name> - <rename>disc4_10</rename> - </value> - <value> - <name>disc5_1</name> - <rename>disc5_1</rename> - </value> - <value> - <name>disc5_2</name> - <rename>disc5_2</rename> - </value> - <value> - <name>disc5_3</name> - <rename>disc5_3</rename> - </value> - <value> - <name>disc5_4</name> - <rename>disc5_4</rename> - </value> - <value> - <name>disc5_5</name> - <rename>disc5_5</rename> - </value> - <value> - <name>disc5_6</name> - <rename>disc5_6</rename> - </value> - <value> - <name>disc5_7</name> - <rename>disc5_7</rename> - </value> - <value> - <name>disc5_8</name> - <rename>disc5_8</rename> - </value> - <value> - <name>disc5_9</name> - <rename>disc5_9</rename> - </value> - <value> - <name>disc5_10</name> - <rename>disc5_10</rename> - </value> - <value> - <name>vendor_id</name> - <rename>vendor_id</rename> - </value> - </lookup> - <attributes/> - <cluster_schema/> - <remotesteps> - <input> - </input> - <output> - </output> - </remotesteps> - <GUI> - <xloc>1168</xloc> - <yloc>352</yloc> - <draw>Y</draw> - </GUI> - </step> - <step> - <name>calculate price tier override vendor</name> + <name>calculate diff override vendor</name> <type>Calculator</type> <description/> <distribute>Y</distribute> @@ -2703,12 +1926,12 @@ where b.purchase_price_exist = 'Y'</sql> </partitioning> <failIfNoFile>Y</failIfNoFile> <calculation> - <field_name>price_before_disc1</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_group1</field_b> + <field_name>diff1_1</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc1</field_a> + <field_b>price_after_disc_1</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2718,12 +1941,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_before_disc2</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_group2</field_b> + <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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2733,12 +1956,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_before_disc3</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_group3</field_b> + <field_name>diff1_2</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc2</field_a> + <field_b>price_after_disc_2</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2748,12 +1971,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_before_disc4</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_group4</field_b> + <field_name>diff1_3</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc3</field_a> + <field_b>price_after_disc_3</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2763,12 +1986,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_before_disc5</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_group5</field_b> + <field_name>diff1_4</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc4</field_a> + <field_b>price_after_disc_4</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2778,12 +2001,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_before_disc6</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_group6</field_b> + <field_name>diff1_5</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc5</field_a> + <field_b>price_after_disc_5</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2793,12 +2016,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_before_disc7</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_group7</field_b> + <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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2808,12 +2031,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_before_disc8</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_group8</field_b> + <field_name>diff1_7</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc7</field_a> + <field_b>price_after_disc_7</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2823,12 +2046,12 @@ where b.purchase_price_exist = 'Y'</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_name>diff1_8</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc8</field_a> + <field_b>price_after_disc_8</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2838,12 +2061,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2853,12 +2076,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_after_disc_1</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_std1</field_b> + <field_name>diff2_1</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc1</field_a> + <field_b>price_tier2_1</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2868,12 +2091,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_after_disc_2</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_std2</field_b> + <field_name>diff2_2</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc2</field_a> + <field_b>price_tier2_2</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2883,12 +2106,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_after_disc_3</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_std3</field_b> + <field_name>diff2_3</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc3</field_a> + <field_b>price_tier2_3</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2898,12 +2121,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_after_disc_4</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_std4</field_b> + <field_name>diff2_4</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc4</field_a> + <field_b>price_tier2_4</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2913,12 +2136,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_after_disc_5</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_std5</field_b> + <field_name>diff2_5</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc5</field_a> + <field_b>price_tier2_5</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2928,12 +2151,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2943,12 +2166,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2958,12 +2181,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2973,12 +2196,12 @@ where b.purchase_price_exist = 'Y'</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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2988,12 +2211,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_name>diff3_1</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc1</field_a> + <field_b>price_tier3_1</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3003,12 +2226,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier2_1</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier2_1</field_b> + <field_name>diff2_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3018,12 +2241,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier2_2</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier2_2</field_b> + <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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3033,12 +2256,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier2_3</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier2_3</field_b> + <field_name>diff3_2</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc2</field_a> + <field_b>price_tier3_2</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3048,12 +2271,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier2_4</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier2_4</field_b> + <field_name>diff3_3</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc3</field_a> + <field_b>price_tier3_3</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3063,12 +2286,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier2_5</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier2_5</field_b> + <field_name>diff3_4</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc4</field_a> + <field_b>price_tier3_4</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3078,12 +2301,12 @@ where b.purchase_price_exist = 'Y'</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_name>diff3_5</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc5</field_a> + <field_b>price_tier3_5</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3093,12 +2316,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3108,12 +2331,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3123,12 +2346,12 @@ where b.purchase_price_exist = 'Y'</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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3138,12 +2361,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3153,12 +2376,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier3_1</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier3_1</field_b> + <field_name>diff4_1</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc1</field_a> + <field_b>price_tier4_1</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3168,12 +2391,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier3_2</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier3_2</field_b> + <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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3183,12 +2406,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier3_3</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier3_3</field_b> + <field_name>diff4_2</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc2</field_a> + <field_b>price_tier4_2</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3198,12 +2421,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier3_4</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier3_4</field_b> + <field_name>diff4_3</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc3</field_a> + <field_b>price_tier4_3</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3213,12 +2436,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier3_5</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier3_5</field_b> + <field_name>diff4_4</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc4</field_a> + <field_b>price_tier4_4</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3228,12 +2451,12 @@ where b.purchase_price_exist = 'Y'</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_name>diff4_5</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc5</field_a> + <field_b>price_tier4_5</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3243,12 +2466,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3258,12 +2481,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3273,12 +2496,12 @@ where b.purchase_price_exist = 'Y'</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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3288,12 +2511,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3303,12 +2526,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier4_1</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier4_1</field_b> + <field_name>diff5_1</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc1</field_a> + <field_b>price_tier5_1</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3318,12 +2541,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier4_2</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier4_2</field_b> + <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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3333,12 +2556,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier4_3</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier4_3</field_b> + <field_name>diff5_2</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc2</field_a> + <field_b>price_tier5_2</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3348,12 +2571,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier4_4</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier4_4</field_b> + <field_name>diff5_3</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc3</field_a> + <field_b>price_tier5_3</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3363,12 +2586,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier4_5</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier4_5</field_b> + <field_name>diff5_4</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc4</field_a> + <field_b>price_tier5_4</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3378,12 +2601,12 @@ where b.purchase_price_exist = 'Y'</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_name>diff5_5</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc5</field_a> + <field_b>price_tier5_5</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3393,12 +2616,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3408,12 +2631,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3423,12 +2646,12 @@ where b.purchase_price_exist = 'Y'</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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3438,12 +2661,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3452,11 +2675,37 @@ where b.purchase_price_exist = 'Y'</sql> <grouping_symbol/> <currency_symbol/> </calculation> + <attributes/> + <cluster_schema/> + <remotesteps> + <input> + </input> + <output> + </output> + </remotesteps> + <GUI> + <xloc>576</xloc> + <yloc>352</yloc> + <draw>Y</draw> + </GUI> + </step> + <step> + <name>calculate discount override vendor</name> + <type>Calculator</type> + <description/> + <distribute>Y</distribute> + <custom_distribution/> + <copies>1</copies> + <partitioning> + <method>none</method> + <schema_name/> + </partitioning> + <failIfNoFile>Y</failIfNoFile> <calculation> - <field_name>price_tier5_1</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier5_1</field_b> + <field_name>disc1_1</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff1_1</field_a> + <field_b>price_before_disc1</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3468,10 +2717,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier5_2</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier5_2</field_b> + <field_name>disc1_2</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff1_2</field_a> + <field_b>price_before_disc2</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3483,10 +2732,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier5_3</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier5_3</field_b> + <field_name>disc1_3</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff1_3</field_a> + <field_b>price_before_disc3</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3498,10 +2747,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier5_4</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier5_4</field_b> + <field_name>disc1_4</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff1_4</field_a> + <field_b>price_before_disc4</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3513,10 +2762,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>price_tier5_5</field_name> - <calc_type>PERCENT_3</calc_type> - <field_a>purchase_price</field_a> - <field_b>markup_tier5_5</field_b> + <field_name>disc1_5</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff1_5</field_a> + <field_b>price_before_disc5</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3528,10 +2777,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -3543,10 +2792,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -3558,10 +2807,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -3573,10 +2822,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -3588,10 +2837,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -3602,39 +2851,13 @@ where b.purchase_price_exist = 'Y'</sql> <grouping_symbol/> <currency_symbol/> </calculation> - <attributes/> - <cluster_schema/> - <remotesteps> - <input> - </input> - <output> - </output> - </remotesteps> - <GUI> - <xloc>576</xloc> - <yloc>128</yloc> - <draw>Y</draw> - </GUI> - </step> - <step> - <name>calculate diff override vendor</name> - <type>Calculator</type> - <description/> - <distribute>Y</distribute> - <custom_distribution/> - <copies>1</copies> - <partitioning> - <method>none</method> - <schema_name/> - </partitioning> - <failIfNoFile>Y</failIfNoFile> <calculation> - <field_name>diff1_1</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_after_disc_1</field_b> + <field_name>disc2_1</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_1</field_a> + <field_b>price_before_disc1</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3644,12 +2867,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff1_2</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc2</field_a> - <field_b>price_after_disc_2</field_b> + <field_name>disc2_2</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_2</field_a> + <field_b>price_before_disc2</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3659,12 +2882,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff1_3</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc3</field_a> - <field_b>price_after_disc_3</field_b> + <field_name>disc2_3</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_3</field_a> + <field_b>price_before_disc3</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3674,12 +2897,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff1_4</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc4</field_a> - <field_b>price_after_disc_4</field_b> + <field_name>disc2_4</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_4</field_a> + <field_b>price_before_disc4</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3689,12 +2912,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff1_5</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc5</field_a> - <field_b>price_after_disc_5</field_b> + <field_name>disc2_5</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_5</field_a> + <field_b>price_before_disc5</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3704,12 +2927,12 @@ where b.purchase_price_exist = 'Y'</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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3719,12 +2942,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_disc_7</field_b> + <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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3734,12 +2957,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_disc_8</field_b> + <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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3749,12 +2972,12 @@ where b.purchase_price_exist = 'Y'</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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3764,12 +2987,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3779,12 +3002,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff2_1</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_tier2_1</field_b> + <field_name>disc3_1</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_1</field_a> + <field_b>price_before_disc1</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3794,12 +3017,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff2_2</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc2</field_a> - <field_b>price_tier2_2</field_b> + <field_name>disc3_2</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_2</field_a> + <field_b>price_before_disc2</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3809,12 +3032,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff2_3</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc3</field_a> - <field_b>price_tier2_3</field_b> + <field_name>disc3_3</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_3</field_a> + <field_b>price_before_disc3</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3824,12 +3047,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff2_4</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc4</field_a> - <field_b>price_tier2_4</field_b> + <field_name>disc3_4</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_4</field_a> + <field_b>price_before_disc4</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3839,12 +3062,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff2_5</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc5</field_a> - <field_b>price_tier2_5</field_b> + <field_name>disc3_5</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_5</field_a> + <field_b>price_before_disc5</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3854,12 +3077,12 @@ where b.purchase_price_exist = 'Y'</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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3869,12 +3092,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3884,12 +3107,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3899,12 +3122,12 @@ where b.purchase_price_exist = 'Y'</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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3914,12 +3137,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3929,12 +3152,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff3_1</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_tier3_1</field_b> + <field_name>disc4_1</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_1</field_a> + <field_b>price_before_disc1</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3944,12 +3167,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff3_2</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc2</field_a> - <field_b>price_tier3_2</field_b> + <field_name>disc4_2</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_2</field_a> + <field_b>price_before_disc2</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3959,12 +3182,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff3_3</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc3</field_a> - <field_b>price_tier3_3</field_b> + <field_name>disc4_3</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_3</field_a> + <field_b>price_before_disc3</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3974,12 +3197,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff3_4</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc4</field_a> - <field_b>price_tier3_4</field_b> + <field_name>disc4_4</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_4</field_a> + <field_b>price_before_disc4</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3989,12 +3212,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff3_5</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc5</field_a> - <field_b>price_tier3_5</field_b> + <field_name>disc4_5</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_5</field_a> + <field_b>price_before_disc5</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4004,12 +3227,12 @@ where b.purchase_price_exist = 'Y'</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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4019,12 +3242,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4034,12 +3257,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4049,12 +3272,12 @@ where b.purchase_price_exist = 'Y'</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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4064,12 +3287,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4079,12 +3302,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff4_1</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_tier4_1</field_b> + <field_name>disc5_1</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_1</field_a> + <field_b>price_before_disc1</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4094,12 +3317,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff4_2</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc2</field_a> - <field_b>price_tier4_2</field_b> + <field_name>disc5_2</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_2</field_a> + <field_b>price_before_disc2</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4109,12 +3332,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff4_3</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc3</field_a> - <field_b>price_tier4_3</field_b> + <field_name>disc5_3</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_3</field_a> + <field_b>price_before_disc3</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4124,12 +3347,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff4_4</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc4</field_a> - <field_b>price_tier4_4</field_b> + <field_name>disc5_4</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_4</field_a> + <field_b>price_before_disc4</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4139,12 +3362,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff4_5</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc5</field_a> - <field_b>price_tier4_5</field_b> + <field_name>disc5_5</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_5</field_a> + <field_b>price_before_disc5</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4154,12 +3377,12 @@ where b.purchase_price_exist = 'Y'</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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4169,12 +3392,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4184,12 +3407,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4199,12 +3422,12 @@ where b.purchase_price_exist = 'Y'</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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4214,12 +3437,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4228,13 +3451,39 @@ where b.purchase_price_exist = 'Y'</sql> <grouping_symbol/> <currency_symbol/> </calculation> + <attributes/> + <cluster_schema/> + <remotesteps> + <input> + </input> + <output> + </output> + </remotesteps> + <GUI> + <xloc>832</xloc> + <yloc>352</yloc> + <draw>Y</draw> + </GUI> + </step> + <step> + <name>calculate price tier override vendor</name> + <type>Calculator</type> + <description/> + <distribute>Y</distribute> + <custom_distribution/> + <copies>1</copies> + <partitioning> + <method>none</method> + <schema_name/> + </partitioning> + <failIfNoFile>Y</failIfNoFile> <calculation> - <field_name>diff5_1</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc1</field_a> - <field_b>price_tier5_1</field_b> + <field_name>price_before_disc1</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group1</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4244,12 +3493,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff5_2</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc2</field_a> - <field_b>price_tier5_2</field_b> + <field_name>price_before_disc2</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group2</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4259,12 +3508,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff5_3</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc3</field_a> - <field_b>price_tier5_3</field_b> + <field_name>price_before_disc3</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group3</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4274,12 +3523,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff5_4</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc4</field_a> - <field_b>price_tier5_4</field_b> + <field_name>price_before_disc4</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group4</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4289,12 +3538,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>diff5_5</field_name> - <calc_type>SUBTRACT</calc_type> - <field_a>price_before_disc5</field_a> - <field_b>price_tier5_5</field_b> + <field_name>price_before_disc5</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group5</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4304,12 +3553,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_name>price_before_disc6</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group6</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4319,12 +3568,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_name>price_before_disc7</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group7</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4334,12 +3583,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_name>price_before_disc8</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group8</field_b> <field_c/> - <value_type>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4349,12 +3598,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4364,12 +3613,12 @@ where b.purchase_price_exist = 'Y'</sql> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -4378,37 +3627,11 @@ where b.purchase_price_exist = 'Y'</sql> <grouping_symbol/> <currency_symbol/> </calculation> - <attributes/> - <cluster_schema/> - <remotesteps> - <input> - </input> - <output> - </output> - </remotesteps> - <GUI> - <xloc>576</xloc> - <yloc>352</yloc> - <draw>Y</draw> - </GUI> - </step> - <step> - <name>calculate discount override vendor</name> - <type>Calculator</type> - <description/> - <distribute>Y</distribute> - <custom_distribution/> - <copies>1</copies> - <partitioning> - <method>none</method> - <schema_name/> - </partitioning> - <failIfNoFile>Y</failIfNoFile> <calculation> - <field_name>disc1_1</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff1_1</field_a> - <field_b>price_before_disc1</field_b> + <field_name>price_after_disc_1</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_std1</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4420,10 +3643,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc1_2</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff1_2</field_a> - <field_b>price_before_disc2</field_b> + <field_name>price_after_disc_2</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_std2</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4435,10 +3658,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc1_3</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff1_3</field_a> - <field_b>price_before_disc3</field_b> + <field_name>price_after_disc_3</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_std3</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4450,10 +3673,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc1_4</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff1_4</field_a> - <field_b>price_before_disc4</field_b> + <field_name>price_after_disc_4</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_std4</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4465,10 +3688,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc1_5</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff1_5</field_a> - <field_b>price_before_disc5</field_b> + <field_name>price_after_disc_5</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_std5</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4480,10 +3703,10 @@ where b.purchase_price_exist = 'Y'</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_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> @@ -4495,10 +3718,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4510,10 +3733,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4525,10 +3748,10 @@ where b.purchase_price_exist = 'Y'</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_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> @@ -4540,10 +3763,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4555,10 +3778,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc2_1</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff2_1</field_a> - <field_b>price_before_disc1</field_b> + <field_name>price_tier2_1</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier2_1</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4570,10 +3793,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc2_2</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff2_2</field_a> - <field_b>price_before_disc2</field_b> + <field_name>price_tier2_2</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier2_2</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4585,10 +3808,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc2_3</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff2_3</field_a> - <field_b>price_before_disc3</field_b> + <field_name>price_tier2_3</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier2_3</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4600,10 +3823,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc2_4</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff2_4</field_a> - <field_b>price_before_disc4</field_b> + <field_name>price_tier2_4</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier2_4</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4615,10 +3838,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc2_5</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff2_5</field_a> - <field_b>price_before_disc5</field_b> + <field_name>price_tier2_5</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier2_5</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4630,10 +3853,10 @@ where b.purchase_price_exist = 'Y'</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_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> @@ -4645,10 +3868,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4660,10 +3883,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4675,10 +3898,10 @@ where b.purchase_price_exist = 'Y'</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_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> @@ -4690,10 +3913,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4705,10 +3928,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc3_1</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff3_1</field_a> - <field_b>price_before_disc1</field_b> + <field_name>price_tier3_1</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier3_1</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4720,10 +3943,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc3_2</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff3_2</field_a> - <field_b>price_before_disc2</field_b> + <field_name>price_tier3_2</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier3_2</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4735,10 +3958,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc3_3</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff3_3</field_a> - <field_b>price_before_disc3</field_b> + <field_name>price_tier3_3</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier3_3</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4750,10 +3973,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc3_4</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff3_4</field_a> - <field_b>price_before_disc4</field_b> + <field_name>price_tier3_4</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier3_4</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4765,10 +3988,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc3_5</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff3_5</field_a> - <field_b>price_before_disc5</field_b> + <field_name>price_tier3_5</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier3_5</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4780,10 +4003,10 @@ where b.purchase_price_exist = 'Y'</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_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> @@ -4795,10 +4018,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4810,10 +4033,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4825,10 +4048,10 @@ where b.purchase_price_exist = 'Y'</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_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> @@ -4840,10 +4063,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4855,10 +4078,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc4_1</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff4_1</field_a> - <field_b>price_before_disc1</field_b> + <field_name>price_tier4_1</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_1</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4870,10 +4093,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc4_2</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff4_2</field_a> - <field_b>price_before_disc2</field_b> + <field_name>price_tier4_2</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_2</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4885,10 +4108,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc4_3</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff4_3</field_a> - <field_b>price_before_disc3</field_b> + <field_name>price_tier4_3</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_3</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4900,10 +4123,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc4_4</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff4_4</field_a> - <field_b>price_before_disc4</field_b> + <field_name>price_tier4_4</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_4</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4915,10 +4138,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc4_5</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff4_5</field_a> - <field_b>price_before_disc5</field_b> + <field_name>price_tier4_5</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_5</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -4930,10 +4153,10 @@ where b.purchase_price_exist = 'Y'</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_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> @@ -4945,10 +4168,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4960,10 +4183,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -4975,10 +4198,10 @@ where b.purchase_price_exist = 'Y'</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_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> @@ -4990,10 +4213,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -5005,10 +4228,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc5_1</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff5_1</field_a> - <field_b>price_before_disc1</field_b> + <field_name>price_tier5_1</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_1</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -5020,10 +4243,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc5_2</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff5_2</field_a> - <field_b>price_before_disc2</field_b> + <field_name>price_tier5_2</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_2</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -5035,10 +4258,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc5_3</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff5_3</field_a> - <field_b>price_before_disc3</field_b> + <field_name>price_tier5_3</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_3</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -5050,10 +4273,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc5_4</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff5_4</field_a> - <field_b>price_before_disc4</field_b> + <field_name>price_tier5_4</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_4</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -5065,10 +4288,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <calculation> - <field_name>disc5_5</field_name> - <calc_type>PERCENT_1</calc_type> - <field_a>diff5_5</field_a> - <field_b>price_before_disc5</field_b> + <field_name>price_tier5_5</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_5</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -5080,10 +4303,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -5095,10 +4318,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -5110,10 +4333,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -5125,10 +4348,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -5140,10 +4363,10 @@ where b.purchase_price_exist = 'Y'</sql> <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_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> @@ -5163,7 +4386,784 @@ where b.purchase_price_exist = 'Y'</sql> </output> </remotesteps> <GUI> - <xloc>832</xloc> + <xloc>576</xloc> + <yloc>128</yloc> + <draw>Y</draw> + </GUI> + </step> + <step> + <name>filter override vendor purchase price = 0</name> + <type>WriteToLog</type> + <description/> + <distribute>Y</distribute> + <custom_distribution/> + <copies>1</copies> + <partitioning> + <method>none</method> + <schema_name/> + </partitioning> + <loglevel>log_level_basic</loglevel> + <displayHeader>Y</displayHeader> + <limitRows>N</limitRows> + <limitRowsNumber>0</limitRowsNumber> + <logmessage/> + <fields> + </fields> + <attributes/> + <cluster_schema/> + <remotesteps> + <input> + </input> + <output> + </output> + </remotesteps> + <GUI> + <xloc>352</xloc> + <yloc>256</yloc> + <draw>Y</draw> + </GUI> + </step> + <step> + <name>update purchase pricelist override vendor</name> + <type>Update</type> + <description/> + <distribute>Y</distribute> + <custom_distribution/> + <copies>1</copies> + <partitioning> + <method>none</method> + <schema_name/> + </partitioning> + <connection>dw bi indoteknik (localhost)</connection> + <skip_lookup>N</skip_lookup> + <commit>100</commit> + <use_batch>N</use_batch> + <error_ignored>N</error_ignored> + <ignore_flag_field/> + <lookup> + <schema>public</schema> + <table>pricelist_compute</table> + <key> + <name>product_id</name> + <field>product_id</field> + <condition>=</condition> + <name2/> + </key> + <value> + <name>item_code</name> + <rename>item_code</rename> + </value> + <value> + <name>name</name> + <rename>name</rename> + </value> + <value> + <name>pricing_group</name> + <rename>pricing_group</rename> + </value> + <value> + <name>purchase_price</name> + <rename>purchase_price</rename> + </value> + <value> + <name>vendor</name> + <rename>vendor</rename> + </value> + <value> + <name>markup_std1</name> + <rename>markup_std1</rename> + </value> + <value> + <name>markup_std2</name> + <rename>markup_std2</rename> + </value> + <value> + <name>markup_std3</name> + <rename>markup_std3</rename> + </value> + <value> + <name>markup_std4</name> + <rename>markup_std4</rename> + </value> + <value> + <name>markup_std5</name> + <rename>markup_std5</rename> + </value> + <value> + <name>markup_std6</name> + <rename>markup_std6</rename> + </value> + <value> + <name>markup_std7</name> + <rename>markup_std7</rename> + </value> + <value> + <name>markup_std8</name> + <rename>markup_std8</rename> + </value> + <value> + <name>markup_std9</name> + <rename>markup_std9</rename> + </value> + <value> + <name>markup_std10</name> + <rename>markup_std10</rename> + </value> + <value> + <name>markup_group1</name> + <rename>markup_group1</rename> + </value> + <value> + <name>markup_group2</name> + <rename>markup_group2</rename> + </value> + <value> + <name>markup_group3</name> + <rename>markup_group3</rename> + </value> + <value> + <name>markup_group4</name> + <rename>markup_group4</rename> + </value> + <value> + <name>markup_group5</name> + <rename>markup_group5</rename> + </value> + <value> + <name>markup_group6</name> + <rename>markup_group6</rename> + </value> + <value> + <name>markup_group7</name> + <rename>markup_group7</rename> + </value> + <value> + <name>markup_group8</name> + <rename>markup_group8</rename> + </value> + <value> + <name>markup_group9</name> + <rename>markup_group9</rename> + </value> + <value> + <name>markup_group10</name> + <rename>markup_group10</rename> + </value> + <value> + <name>markup_tier2_1</name> + <rename>markup_tier2_1</rename> + </value> + <value> + <name>markup_tier2_2</name> + <rename>markup_tier2_2</rename> + </value> + <value> + <name>markup_tier2_3</name> + <rename>markup_tier2_3</rename> + </value> + <value> + <name>markup_tier2_4</name> + <rename>markup_tier2_4</rename> + </value> + <value> + <name>markup_tier2_5</name> + <rename>markup_tier2_5</rename> + </value> + <value> + <name>markup_tier2_6</name> + <rename>markup_tier2_6</rename> + </value> + <value> + <name>markup_tier2_7</name> + <rename>markup_tier2_7</rename> + </value> + <value> + <name>markup_tier2_8</name> + <rename>markup_tier2_8</rename> + </value> + <value> + <name>markup_tier2_9</name> + <rename>markup_tier2_9</rename> + </value> + <value> + <name>markup_tier2_10</name> + <rename>markup_tier2_10</rename> + </value> + <value> + <name>markup_tier3_1</name> + <rename>markup_tier3_1</rename> + </value> + <value> + <name>markup_tier3_2</name> + <rename>markup_tier3_2</rename> + </value> + <value> + <name>markup_tier3_3</name> + <rename>markup_tier3_3</rename> + </value> + <value> + <name>markup_tier3_4</name> + <rename>markup_tier3_4</rename> + </value> + <value> + <name>markup_tier3_5</name> + <rename>markup_tier3_5</rename> + </value> + <value> + <name>markup_tier3_6</name> + <rename>markup_tier3_6</rename> + </value> + <value> + <name>markup_tier3_7</name> + <rename>markup_tier3_7</rename> + </value> + <value> + <name>markup_tier3_8</name> + <rename>markup_tier3_8</rename> + </value> + <value> + <name>markup_tier3_9</name> + <rename>markup_tier3_9</rename> + </value> + <value> + <name>markup_tier3_10</name> + <rename>markup_tier3_10</rename> + </value> + <value> + <name>markup_tier4_1</name> + <rename>markup_tier4_1</rename> + </value> + <value> + <name>markup_tier4_2</name> + <rename>markup_tier4_2</rename> + </value> + <value> + <name>markup_tier4_3</name> + <rename>markup_tier4_3</rename> + </value> + <value> + <name>markup_tier4_4</name> + <rename>markup_tier4_4</rename> + </value> + <value> + <name>markup_tier4_5</name> + <rename>markup_tier4_5</rename> + </value> + <value> + <name>markup_tier4_6</name> + <rename>markup_tier4_6</rename> + </value> + <value> + <name>markup_tier4_7</name> + <rename>markup_tier4_7</rename> + </value> + <value> + <name>markup_tier4_8</name> + <rename>markup_tier4_8</rename> + </value> + <value> + <name>markup_tier4_9</name> + <rename>markup_tier4_9</rename> + </value> + <value> + <name>markup_tier4_10</name> + <rename>markup_tier4_10</rename> + </value> + <value> + <name>markup_tier5_1</name> + <rename>markup_tier5_1</rename> + </value> + <value> + <name>markup_tier5_2</name> + <rename>markup_tier5_2</rename> + </value> + <value> + <name>markup_tier5_3</name> + <rename>markup_tier5_3</rename> + </value> + <value> + <name>markup_tier5_4</name> + <rename>markup_tier5_4</rename> + </value> + <value> + <name>markup_tier5_5</name> + <rename>markup_tier5_5</rename> + </value> + <value> + <name>markup_tier5_6</name> + <rename>markup_tier5_6</rename> + </value> + <value> + <name>markup_tier5_7</name> + <rename>markup_tier5_7</rename> + </value> + <value> + <name>markup_tier5_8</name> + <rename>markup_tier5_8</rename> + </value> + <value> + <name>markup_tier5_9</name> + <rename>markup_tier5_9</rename> + </value> + <value> + <name>markup_tier5_10</name> + <rename>markup_tier5_10</rename> + </value> + <value> + <name>price_before_disc1</name> + <rename>price_before_disc1</rename> + </value> + <value> + <name>price_before_disc2</name> + <rename>price_before_disc2</rename> + </value> + <value> + <name>price_before_disc3</name> + <rename>price_before_disc3</rename> + </value> + <value> + <name>price_before_disc4</name> + <rename>price_before_disc4</rename> + </value> + <value> + <name>price_before_disc5</name> + <rename>price_before_disc5</rename> + </value> + <value> + <name>price_before_disc6</name> + <rename>price_before_disc6</rename> + </value> + <value> + <name>price_before_disc7</name> + <rename>price_before_disc7</rename> + </value> + <value> + <name>price_before_disc8</name> + <rename>price_before_disc8</rename> + </value> + <value> + <name>price_before_disc9</name> + <rename>price_before_disc9</rename> + </value> + <value> + <name>price_before_disc10</name> + <rename>price_before_disc10</rename> + </value> + <value> + <name>price_after_disc_1</name> + <rename>price_after_disc_1</rename> + </value> + <value> + <name>price_after_disc_2</name> + <rename>price_after_disc_2</rename> + </value> + <value> + <name>price_after_disc_3</name> + <rename>price_after_disc_3</rename> + </value> + <value> + <name>price_after_disc_4</name> + <rename>price_after_disc_4</rename> + </value> + <value> + <name>price_after_disc_5</name> + <rename>price_after_disc_5</rename> + </value> + <value> + <name>price_after_disc_6</name> + <rename>price_after_disc_6</rename> + </value> + <value> + <name>price_after_disc_7</name> + <rename>price_after_disc_7</rename> + </value> + <value> + <name>price_after_disc_8</name> + <rename>price_after_disc_8</rename> + </value> + <value> + <name>price_after_disc_9</name> + <rename>price_after_disc_9</rename> + </value> + <value> + <name>price_after_disc_10</name> + <rename>price_after_disc_10</rename> + </value> + <value> + <name>price_tier2_1</name> + <rename>price_tier2_1</rename> + </value> + <value> + <name>price_tier2_2</name> + <rename>price_tier2_2</rename> + </value> + <value> + <name>price_tier2_3</name> + <rename>price_tier2_3</rename> + </value> + <value> + <name>price_tier2_4</name> + <rename>price_tier2_4</rename> + </value> + <value> + <name>price_tier2_5</name> + <rename>price_tier2_5</rename> + </value> + <value> + <name>price_tier2_6</name> + <rename>price_tier2_6</rename> + </value> + <value> + <name>price_tier2_7</name> + <rename>price_tier2_7</rename> + </value> + <value> + <name>price_tier2_8</name> + <rename>price_tier2_8</rename> + </value> + <value> + <name>price_tier2_9</name> + <rename>price_tier2_9</rename> + </value> + <value> + <name>price_tier2_10</name> + <rename>price_tier2_10</rename> + </value> + <value> + <name>price_tier3_1</name> + <rename>price_tier3_1</rename> + </value> + <value> + <name>price_tier3_2</name> + <rename>price_tier3_2</rename> + </value> + <value> + <name>price_tier3_3</name> + <rename>price_tier3_3</rename> + </value> + <value> + <name>price_tier3_4</name> + <rename>price_tier3_4</rename> + </value> + <value> + <name>price_tier3_5</name> + <rename>price_tier3_5</rename> + </value> + <value> + <name>price_tier3_6</name> + <rename>price_tier3_6</rename> + </value> + <value> + <name>price_tier3_7</name> + <rename>price_tier3_7</rename> + </value> + <value> + <name>price_tier3_8</name> + <rename>price_tier3_8</rename> + </value> + <value> + <name>price_tier3_9</name> + <rename>price_tier3_9</rename> + </value> + <value> + <name>price_tier3_10</name> + <rename>price_tier3_10</rename> + </value> + <value> + <name>price_tier4_1</name> + <rename>price_tier4_1</rename> + </value> + <value> + <name>price_tier4_2</name> + <rename>price_tier4_2</rename> + </value> + <value> + <name>price_tier4_3</name> + <rename>price_tier4_3</rename> + </value> + <value> + <name>price_tier4_4</name> + <rename>price_tier4_4</rename> + </value> + <value> + <name>price_tier4_5</name> + <rename>price_tier4_5</rename> + </value> + <value> + <name>price_tier4_6</name> + <rename>price_tier4_6</rename> + </value> + <value> + <name>price_tier4_7</name> + <rename>price_tier4_7</rename> + </value> + <value> + <name>price_tier4_8</name> + <rename>price_tier4_8</rename> + </value> + <value> + <name>price_tier4_9</name> + <rename>price_tier4_9</rename> + </value> + <value> + <name>price_tier4_10</name> + <rename>price_tier4_10</rename> + </value> + <value> + <name>price_tier5_1</name> + <rename>price_tier5_1</rename> + </value> + <value> + <name>price_tier5_2</name> + <rename>price_tier5_2</rename> + </value> + <value> + <name>price_tier5_3</name> + <rename>price_tier5_3</rename> + </value> + <value> + <name>price_tier5_4</name> + <rename>price_tier5_4</rename> + </value> + <value> + <name>price_tier5_5</name> + <rename>price_tier5_5</rename> + </value> + <value> + <name>price_tier5_6</name> + <rename>price_tier5_6</rename> + </value> + <value> + <name>price_tier5_7</name> + <rename>price_tier5_7</rename> + </value> + <value> + <name>price_tier5_8</name> + <rename>price_tier5_8</rename> + </value> + <value> + <name>price_tier5_9</name> + <rename>price_tier5_9</rename> + </value> + <value> + <name>price_tier5_10</name> + <rename>price_tier5_10</rename> + </value> + <value> + <name>disc1_1</name> + <rename>disc1_1</rename> + </value> + <value> + <name>disc1_2</name> + <rename>disc1_2</rename> + </value> + <value> + <name>disc1_3</name> + <rename>disc1_3</rename> + </value> + <value> + <name>disc1_4</name> + <rename>disc1_4</rename> + </value> + <value> + <name>disc1_5</name> + <rename>disc1_5</rename> + </value> + <value> + <name>disc1_6</name> + <rename>disc1_6</rename> + </value> + <value> + <name>disc1_7</name> + <rename>disc1_7</rename> + </value> + <value> + <name>disc1_8</name> + <rename>disc1_8</rename> + </value> + <value> + <name>disc1_9</name> + <rename>disc1_9</rename> + </value> + <value> + <name>disc1_10</name> + <rename>disc1_10</rename> + </value> + <value> + <name>disc2_1</name> + <rename>disc2_1</rename> + </value> + <value> + <name>disc2_2</name> + <rename>disc2_2</rename> + </value> + <value> + <name>disc2_3</name> + <rename>disc2_3</rename> + </value> + <value> + <name>disc2_4</name> + <rename>disc2_4</rename> + </value> + <value> + <name>disc2_5</name> + <rename>disc2_5</rename> + </value> + <value> + <name>disc2_6</name> + <rename>disc2_6</rename> + </value> + <value> + <name>disc2_7</name> + <rename>disc2_7</rename> + </value> + <value> + <name>disc2_8</name> + <rename>disc2_8</rename> + </value> + <value> + <name>disc2_9</name> + <rename>disc2_9</rename> + </value> + <value> + <name>disc2_10</name> + <rename>disc2_10</rename> + </value> + <value> + <name>disc3_1</name> + <rename>disc3_1</rename> + </value> + <value> + <name>disc3_2</name> + <rename>disc3_2</rename> + </value> + <value> + <name>disc3_3</name> + <rename>disc3_3</rename> + </value> + <value> + <name>disc3_4</name> + <rename>disc3_4</rename> + </value> + <value> + <name>disc3_5</name> + <rename>disc3_5</rename> + </value> + <value> + <name>disc3_6</name> + <rename>disc3_6</rename> + </value> + <value> + <name>disc3_7</name> + <rename>disc3_7</rename> + </value> + <value> + <name>disc3_8</name> + <rename>disc3_8</rename> + </value> + <value> + <name>disc3_9</name> + <rename>disc3_9</rename> + </value> + <value> + <name>disc3_10</name> + <rename>disc3_10</rename> + </value> + <value> + <name>disc4_1</name> + <rename>disc4_1</rename> + </value> + <value> + <name>disc4_2</name> + <rename>disc4_2</rename> + </value> + <value> + <name>disc4_3</name> + <rename>disc4_3</rename> + </value> + <value> + <name>disc4_4</name> + <rename>disc4_4</rename> + </value> + <value> + <name>disc4_5</name> + <rename>disc4_5</rename> + </value> + <value> + <name>disc4_6</name> + <rename>disc4_6</rename> + </value> + <value> + <name>disc4_7</name> + <rename>disc4_7</rename> + </value> + <value> + <name>disc4_8</name> + <rename>disc4_8</rename> + </value> + <value> + <name>disc4_9</name> + <rename>disc4_9</rename> + </value> + <value> + <name>disc4_10</name> + <rename>disc4_10</rename> + </value> + <value> + <name>disc5_1</name> + <rename>disc5_1</rename> + </value> + <value> + <name>disc5_2</name> + <rename>disc5_2</rename> + </value> + <value> + <name>disc5_3</name> + <rename>disc5_3</rename> + </value> + <value> + <name>disc5_4</name> + <rename>disc5_4</rename> + </value> + <value> + <name>disc5_5</name> + <rename>disc5_5</rename> + </value> + <value> + <name>disc5_6</name> + <rename>disc5_6</rename> + </value> + <value> + <name>disc5_7</name> + <rename>disc5_7</rename> + </value> + <value> + <name>disc5_8</name> + <rename>disc5_8</rename> + </value> + <value> + <name>disc5_9</name> + <rename>disc5_9</rename> + </value> + <value> + <name>disc5_10</name> + <rename>disc5_10</rename> + </value> + <value> + <name>vendor_id</name> + <rename>vendor_id</rename> + </value> + </lookup> + <attributes/> + <cluster_schema/> + <remotesteps> + <input> + </input> + <output> + </output> + </remotesteps> + <GUI> + <xloc>1168</xloc> <yloc>352</yloc> <draw>Y</draw> </GUI> |