diff options
| author | FIN-IT_AndriFP <andrifebriyadiputra@gmail.com> | 2026-01-22 14:37:43 +0700 |
|---|---|---|
| committer | FIN-IT_AndriFP <andrifebriyadiputra@gmail.com> | 2026-01-22 14:37:43 +0700 |
| commit | 7716a0734665e80c02f08728071c889b18d073a5 (patch) | |
| tree | 3b6fb31b89260d815a3e6a6d6cef87f912e3354b | |
| parent | a6034649b1352a2b950e4bbe5ce384d51ae17a34 (diff) | |
| parent | 1eebb8c2cbd3b79e4a9385653fb82433168d032e (diff) | |
Merge branch 'master' of https://bitbucket.org/altafixco/transformation-job-bi
| -rw-r--r-- | calculate_price_after_disc.ktr | 668 | ||||
| -rw-r--r-- | import_price_group.ktr | 202 | ||||
| -rw-r--r-- | run_calculate_pricelist_odoo.kjb | 2 | ||||
| -rw-r--r-- | update_override_vendor_pricelist.ktr | 3132 |
4 files changed, 2652 insertions, 1352 deletions
diff --git a/calculate_price_after_disc.ktr b/calculate_price_after_disc.ktr index 426b744..eac6ff3 100644 --- a/calculate_price_after_disc.ktr +++ b/calculate_price_after_disc.ktr @@ -442,8 +442,8 @@ <access>Native</access> <database>dw_bi_indoteknik</database> <port>5432</port> - <username>pdi</username> - <password>Encrypted 2be989bb20084ca95810197629d9ea18e</password> + <username>odoo</username> + <password>Encrypted 2be98afc82bdfd8dd9a2ca45acc83f6c3</password> <servername/> <data_tablespace/> <index_tablespace/> @@ -658,6 +658,8 @@ coalesce(( (select group6 from price_group_dw pgd where id = 2) as markup_std6, (select group7 from price_group_dw pgd where id = 2) as markup_std7, (select group8 from price_group_dw pgd where id = 2) as markup_std8, +(select group9 from price_group_dw pgd where id = 2) as markup_std9,--new +(select group10 from price_group_dw pgd where id = 2) as markup_std10,--new (select group1 from price_group_dw pgd where id = 1) as markup_group1, (select group2 from price_group_dw pgd where id = 1) as markup_group2, (select group3 from price_group_dw pgd where id = 1) as markup_group3, @@ -666,6 +668,8 @@ coalesce(( (select group6 from price_group_dw pgd where id = 1) as markup_group6, (select group7 from price_group_dw pgd where id = 1) as markup_group7, (select group8 from price_group_dw pgd where id = 1) as markup_group8, +(select group9 from price_group_dw pgd where id = 1) as markup_group9,--new +(select group10 from price_group_dw pgd where id = 1) as markup_group10,--new (select group1 from price_group_dw pgd where id = 3) as markup_tier2_1, (select group2 from price_group_dw pgd where id = 3) as markup_tier2_2, (select group3 from price_group_dw pgd where id = 3) as markup_tier2_3, @@ -674,6 +678,8 @@ coalesce(( (select group6 from price_group_dw pgd where id = 3) as markup_tier2_6, (select group7 from price_group_dw pgd where id = 3) as markup_tier2_7, (select group8 from price_group_dw pgd where id = 3) as markup_tier2_8, +(select group9 from price_group_dw pgd where id = 3) as markup_tier2_9,--new +(select group10 from price_group_dw pgd where id = 3) as markup_tier2_10,--new (select group1 from price_group_dw pgd where id = 4) as markup_tier3_1, (select group2 from price_group_dw pgd where id = 4) as markup_tier3_2, (select group3 from price_group_dw pgd where id = 4) as markup_tier3_3, @@ -682,6 +688,8 @@ coalesce(( (select group6 from price_group_dw pgd where id = 4) as markup_tier3_6, (select group7 from price_group_dw pgd where id = 4) as markup_tier3_7, (select group8 from price_group_dw pgd where id = 4) as markup_tier3_8, +(select group9 from price_group_dw pgd where id = 4) as markup_tier3_9,--new +(select group10 from price_group_dw pgd where id = 4) as markup_tier3_10,--new (select group1 from price_group_dw pgd where id = 5) as markup_tier4_1, (select group2 from price_group_dw pgd where id = 5) as markup_tier4_2, (select group3 from price_group_dw pgd where id = 5) as markup_tier4_3, @@ -690,6 +698,8 @@ coalesce(( (select group6 from price_group_dw pgd where id = 5) as markup_tier4_6, (select group7 from price_group_dw pgd where id = 5) as markup_tier4_7, (select group8 from price_group_dw pgd where id = 5) as markup_tier4_8, +(select group9 from price_group_dw pgd where id = 5) as markup_tier4_9,--new +(select group10 from price_group_dw pgd where id = 5) as markup_tier4_10,--new (select group1 from price_group_dw pgd where id = 6) as markup_tier5_1, (select group2 from price_group_dw pgd where id = 6) as markup_tier5_2, (select group3 from price_group_dw pgd where id = 6) as markup_tier5_3, @@ -697,7 +707,9 @@ coalesce(( (select group5 from price_group_dw pgd where id = 6) as markup_tier5_5, (select group6 from price_group_dw pgd where id = 6) as markup_tier5_6, (select group7 from price_group_dw pgd where id = 6) as markup_tier5_7, -(select group8 from price_group_dw pgd where id = 6) as markup_tier5_8 +(select group8 from price_group_dw pgd where id = 6) as markup_tier5_8, +(select group9 from price_group_dw pgd where id = 6) as markup_tier5_9,--new +(select group10 from price_group_dw pgd where id = 6) as markup_tier5_10--new from product p left join brand b on b.id = p.brand_id</sql> <limit>0</limit> @@ -2120,6 +2132,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>diff1_9</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc9</field_a> + <field_b>price_after_disc_9</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff1_10</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc10</field_a> + <field_b>price_after_disc_10</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>diff2_1</field_name> <calc_type>SUBTRACT</calc_type> <field_a>price_before_disc1</field_a> @@ -2240,6 +2282,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>diff2_9</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc9</field_a> + <field_b>price_tier2_9</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff3_10</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc10</field_a> + <field_b>price_tier2_10</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>diff3_1</field_name> <calc_type>SUBTRACT</calc_type> <field_a>price_before_disc1</field_a> @@ -2360,6 +2432,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>diff3_9</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc9</field_a> + <field_b>price_tier3_9</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff3_10</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc10</field_a> + <field_b>price_tier3_10</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>diff4_1</field_name> <calc_type>SUBTRACT</calc_type> <field_a>price_before_disc1</field_a> @@ -2480,6 +2582,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>diff4_9</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc9</field_a> + <field_b>price_tier4_9</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff4_10</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc10</field_a> + <field_b>price_tier4_10</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>diff5_1</field_name> <calc_type>SUBTRACT</calc_type> <field_a>price_before_disc1</field_a> @@ -2599,6 +2731,36 @@ left join brand b on b.id = p.brand_id</sql> <grouping_symbol/> <currency_symbol/> </calculation> + <calculation> + <field_name>diff5_9</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc9</field_a> + <field_b>price_tier5_9</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_10</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc10</field_a> + <field_b>price_tier5_10</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> <attributes/> <cluster_schema/> <remotesteps> @@ -2746,6 +2908,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>disc1_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff1_9</field_a> + <field_b>price_before_disc9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>disc1_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff1_10</field_a> + <field_b>price_before_disc10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>disc2_1</field_name> <calc_type>PERCENT_1</calc_type> <field_a>diff2_1</field_a> @@ -2866,6 +3058,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>disc2_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_9</field_a> + <field_b>price_before_disc9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>disc2_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_10</field_a> + <field_b>price_before_disc10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>disc3_1</field_name> <calc_type>PERCENT_1</calc_type> <field_a>diff3_1</field_a> @@ -2986,6 +3208,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>disc3_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_9</field_a> + <field_b>price_before_disc9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>disc3_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_10</field_a> + <field_b>price_before_disc10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>disc4_1</field_name> <calc_type>PERCENT_1</calc_type> <field_a>diff4_1</field_a> @@ -3106,6 +3358,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>disc4_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_9</field_a> + <field_b>price_before_disc9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>disc4_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_10</field_a> + <field_b>price_before_disc10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>disc5_1</field_name> <calc_type>PERCENT_1</calc_type> <field_a>diff5_1</field_a> @@ -3225,6 +3507,36 @@ left join brand b on b.id = p.brand_id</sql> <grouping_symbol/> <currency_symbol/> </calculation> + <calculation> + <field_name>disc5_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_9</field_a> + <field_b>price_before_disc9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>disc5_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_10</field_a> + <field_b>price_before_disc10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> <attributes/> <cluster_schema/> <remotesteps> @@ -3372,6 +3684,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>price_before_disc9</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_before_disc10</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_group10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>price_after_disc_1</field_name> <calc_type>PERCENT_3</calc_type> <field_a>purchase_price</field_a> @@ -3492,6 +3834,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>price_after_disc_9</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_std9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_after_disc_10</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_std10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>price_tier2_1</field_name> <calc_type>PERCENT_3</calc_type> <field_a>purchase_price</field_a> @@ -3612,6 +3984,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>price_tier2_9</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier2_9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier2_10</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier2_10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>price_tier3_1</field_name> <calc_type>PERCENT_3</calc_type> <field_a>purchase_price</field_a> @@ -3732,6 +4134,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>price_tier3_9</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier3_9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier3_10</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier3_10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>price_tier4_1</field_name> <calc_type>PERCENT_3</calc_type> <field_a>purchase_price</field_a> @@ -3852,6 +4284,36 @@ left join brand b on b.id = p.brand_id</sql> <currency_symbol/> </calculation> <calculation> + <field_name>price_tier4_9</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_10</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> <field_name>price_tier5_1</field_name> <calc_type>PERCENT_3</calc_type> <field_a>purchase_price</field_a> @@ -3971,6 +4433,36 @@ left join brand b on b.id = p.brand_id</sql> <grouping_symbol/> <currency_symbol/> </calculation> + <calculation> + <field_name>price_tier5_9</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_10</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> <attributes/> <cluster_schema/> <remotesteps> @@ -4049,6 +4541,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc1_9</name> + <rename>disc1_9</rename> + <update>Y</update> + </value> + <value> + <name>disc1_10</name> + <rename>disc1_10</rename> + <update>Y</update> + </value> + <value> <name>disc2_1</name> <rename>disc2_1</rename> <update>Y</update> @@ -4089,6 +4591,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc2_9</name> + <rename>disc2_9</rename> + <update>Y</update> + </value> + <value> + <name>disc2_10</name> + <rename>disc2_10</rename> + <update>Y</update> + </value> + <value> <name>disc3_1</name> <rename>disc3_1</rename> <update>Y</update> @@ -4129,6 +4641,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc3_9</name> + <rename>disc3_9</rename> + <update>Y</update> + </value> + <value> + <name>disc3_10</name> + <rename>disc3_10</rename> + <update>Y</update> + </value> + <value> <name>disc4_1</name> <rename>disc4_1</rename> <update>Y</update> @@ -4169,6 +4691,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc4_9</name> + <rename>disc4_9</rename> + <update>Y</update> + </value> + <value> + <name>disc4_10</name> + <rename>disc4_10</rename> + <update>Y</update> + </value> + <value> <name>disc5_1</name> <rename>disc5_1</rename> <update>Y</update> @@ -4209,6 +4741,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>disc5_9</name> + <rename>disc5_9</rename> + <update>Y</update> + </value> + <value> + <name>disc5_10</name> + <rename>disc5_10</rename> + <update>Y</update> + </value> + <value> <name>item_code</name> <rename>item_code</rename> <update>Y</update> @@ -4254,6 +4796,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_group9</name> + <rename>markup_group9</rename> + <update>Y</update> + </value> + <value> + <name>markup_group10</name> + <rename>markup_group10</rename> + <update>Y</update> + </value> + <value> <name>markup_std1</name> <rename>markup_std1</rename> <update>Y</update> @@ -4294,6 +4846,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_std9</name> + <rename>markup_std9</rename> + <update>Y</update> + </value> + <value> + <name>markup_std10</name> + <rename>markup_std10</rename> + <update>Y</update> + </value> + <value> <name>markup_tier2_1</name> <rename>markup_tier2_1</rename> <update>Y</update> @@ -4334,6 +4896,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_tier2_9</name> + <rename>markup_tier2_9</rename> + <update>Y</update> + </value> + <value> + <name>markup_tier2_10</name> + <rename>markup_tier2_10</rename> + <update>Y</update> + </value> + <value> <name>markup_tier3_1</name> <rename>markup_tier3_1</rename> <update>Y</update> @@ -4374,6 +4946,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_tier3_9</name> + <rename>markup_tier3_9</rename> + <update>Y</update> + </value> + <value> + <name>markup_tier3_10</name> + <rename>markup_tier3_10</rename> + <update>Y</update> + </value> + <value> <name>markup_tier4_1</name> <rename>markup_tier4_1</rename> <update>Y</update> @@ -4414,6 +4996,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_tier4_9</name> + <rename>markup_tier4_9</rename> + <update>Y</update> + </value> + <value> + <name>markup_tier4_10</name> + <rename>markup_tier4_10</rename> + <update>Y</update> + </value> + <value> <name>markup_tier5_1</name> <rename>markup_tier5_1</rename> <update>Y</update> @@ -4454,6 +5046,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>markup_tier5_9</name> + <rename>markup_tier5_9</rename> + <update>Y</update> + </value> + <value> + <name>markup_tier5_10</name> + <rename>markup_tier5_10</rename> + <update>Y</update> + </value> + <value> <name>name</name> <rename>name</rename> <update>Y</update> @@ -4499,6 +5101,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_after_disc_9</name> + <rename>price_after_disc_9</rename> + <update>Y</update> + </value> + <value> + <name>price_after_disc_10</name> + <rename>price_after_disc_10</rename> + <update>Y</update> + </value> + <value> <name>price_before_disc1</name> <rename>price_before_disc1</rename> <update>Y</update> @@ -4539,6 +5151,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_before_disc9</name> + <rename>price_before_disc9</rename> + <update>Y</update> + </value> + <value> + <name>price_before_disc10</name> + <rename>price_before_disc10</rename> + <update>Y</update> + </value> + <value> <name>price_tier2_1</name> <rename>price_tier2_1</rename> <update>Y</update> @@ -4579,6 +5201,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_tier2_9</name> + <rename>price_tier2_9</rename> + <update>Y</update> + </value> + <value> + <name>price_tier2_10</name> + <rename>price_tier2_10</rename> + <update>Y</update> + </value> + <value> <name>price_tier3_1</name> <rename>price_tier3_1</rename> <update>Y</update> @@ -4619,6 +5251,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_tier3_9</name> + <rename>price_tier3_9</rename> + <update>Y</update> + </value> + <value> + <name>price_tier3_10</name> + <rename>price_tier3_10</rename> + <update>Y</update> + </value> + <value> <name>price_tier4_1</name> <rename>price_tier4_1</rename> <update>Y</update> @@ -4659,6 +5301,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_tier4_9</name> + <rename>price_tier4_9</rename> + <update>Y</update> + </value> + <value> + <name>price_tier4_10</name> + <rename>price_tier4_10</rename> + <update>Y</update> + </value> + <value> <name>price_tier5_1</name> <rename>price_tier5_1</rename> <update>Y</update> @@ -4699,6 +5351,16 @@ left join brand b on b.id = p.brand_id</sql> <update>Y</update> </value> <value> + <name>price_tier5_9</name> + <rename>price_tier5_9</rename> + <update>Y</update> + </value> + <value> + <name>price_tier5_10</name> + <rename>price_tier5_10</rename> + <update>Y</update> + </value> + <value> <name>pricing_group</name> <rename>pricing_group</rename> <update>Y</update> diff --git a/import_price_group.ktr b/import_price_group.ktr index 459c61c..8eebead 100644 --- a/import_price_group.ktr +++ b/import_price_group.ktr @@ -442,8 +442,8 @@ <access>Native</access> <database>dw_bi_indoteknik</database> <port>5432</port> - <username>pdi</username> - <password>Encrypted 2be989bb20084ca95810197629d9ea18e</password> + <username>odoo</username> + <password>Encrypted 2be98afc82bdfd8dd9a2ca45acc83f6c3</password> <servername/> <data_tablespace/> <index_tablespace/> @@ -545,99 +545,6 @@ </hop> </order> <step> - <name>dw Insert / update group</name> - <type>InsertUpdate</type> - <description/> - <distribute>Y</distribute> - <custom_distribution/> - <copies>1</copies> - <partitioning> - <method>none</method> - <schema_name/> - </partitioning> - <connection>dw bi indoteknik (localhost)</connection> - <commit>100</commit> - <update_bypassed>N</update_bypassed> - <lookup> - <schema>public</schema> - <table>price_group_dw</table> - <key> - <name>id</name> - <field>id</field> - <condition>=</condition> - <name2/> - </key> - <value> - <name>id</name> - <rename>id</rename> - <update>N</update> - </value> - <value> - <name>name</name> - <rename>name</rename> - <update>Y</update> - </value> - <value> - <name>pricelist_id</name> - <rename>pricelist_id</rename> - <update>Y</update> - </value> - <value> - <name>group1</name> - <rename>group1</rename> - <update>Y</update> - </value> - <value> - <name>group2</name> - <rename>group2</rename> - <update>Y</update> - </value> - <value> - <name>group3</name> - <rename>group3</rename> - <update>Y</update> - </value> - <value> - <name>group4</name> - <rename>group4</rename> - <update>Y</update> - </value> - <value> - <name>group5</name> - <rename>group5</rename> - <update>Y</update> - </value> - <value> - <name>group6</name> - <rename>group6</rename> - <update>Y</update> - </value> - <value> - <name>group7</name> - <rename>group7</rename> - <update>Y</update> - </value> - <value> - <name>group8</name> - <rename>group8</rename> - <update>Y</update> - </value> - </lookup> - <attributes/> - <cluster_schema/> - <remotesteps> - <input> - </input> - <output> - </output> - </remotesteps> - <GUI> - <xloc>480</xloc> - <yloc>112</yloc> - <draw>Y</draw> - </GUI> - </step> - <step> <name>Table input</name> <type>TableInput</type> <description/> @@ -649,7 +556,7 @@ <schema_name/> </partitioning> <connection>erp indoteknik production (localhost)</connection> - <sql>select id, name, pricelist_id, group1, group2, group3, group4, group5, group6, group7, group8 from price_group pg</sql> + <sql>select id, name, pricelist_id, group1, group2, group3, group4, group5, group6, group7, group8, group9, group10 from price_group pg</sql> <limit>0</limit> <lookup/> <execute_each_row>N</execute_each_row> @@ -856,6 +763,109 @@ <draw>Y</draw> </GUI> </step> + <step> + <name>dw Insert / update group</name> + <type>InsertUpdate</type> + <description/> + <distribute>Y</distribute> + <custom_distribution/> + <copies>1</copies> + <partitioning> + <method>none</method> + <schema_name/> + </partitioning> + <connection>dw bi indoteknik (localhost)</connection> + <commit>100</commit> + <update_bypassed>N</update_bypassed> + <lookup> + <schema>public</schema> + <table>price_group_dw</table> + <key> + <name>id</name> + <field>id</field> + <condition>=</condition> + <name2/> + </key> + <value> + <name>id</name> + <rename>id</rename> + <update>N</update> + </value> + <value> + <name>name</name> + <rename>name</rename> + <update>Y</update> + </value> + <value> + <name>pricelist_id</name> + <rename>pricelist_id</rename> + <update>Y</update> + </value> + <value> + <name>group1</name> + <rename>group1</rename> + <update>Y</update> + </value> + <value> + <name>group2</name> + <rename>group2</rename> + <update>Y</update> + </value> + <value> + <name>group3</name> + <rename>group3</rename> + <update>Y</update> + </value> + <value> + <name>group4</name> + <rename>group4</rename> + <update>Y</update> + </value> + <value> + <name>group5</name> + <rename>group5</rename> + <update>Y</update> + </value> + <value> + <name>group6</name> + <rename>group6</rename> + <update>Y</update> + </value> + <value> + <name>group7</name> + <rename>group7</rename> + <update>Y</update> + </value> + <value> + <name>group8</name> + <rename>group8</rename> + <update>Y</update> + </value> + <value> + <name>group9</name> + <rename>group9</rename> + <update>Y</update> + </value> + <value> + <name>group10</name> + <rename>group10</rename> + <update>Y</update> + </value> + </lookup> + <attributes/> + <cluster_schema/> + <remotesteps> + <input> + </input> + <output> + </output> + </remotesteps> + <GUI> + <xloc>480</xloc> + <yloc>112</yloc> + <draw>Y</draw> + </GUI> + </step> <step_error_handling> </step_error_handling> <slave-step-copy-partition-distribution> diff --git a/run_calculate_pricelist_odoo.kjb b/run_calculate_pricelist_odoo.kjb index b7e0d00..1f23dd0 100644 --- a/run_calculate_pricelist_odoo.kjb +++ b/run_calculate_pricelist_odoo.kjb @@ -460,7 +460,7 @@ <parallel>N</parallel> <draw>Y</draw> <nr>0</nr> - <xloc>1072</xloc> + <xloc>1056</xloc> <yloc>96</yloc> <attributes_kjc/> </entry> diff --git a/update_override_vendor_pricelist.ktr b/update_override_vendor_pricelist.ktr index 2f8bbee..6264815 100644 --- a/update_override_vendor_pricelist.ktr +++ b/update_override_vendor_pricelist.ktr @@ -442,8 +442,8 @@ <access>Native</access> <database>dw_bi_indoteknik</database> <port>5432</port> - <username>pdi</username> - <password>Encrypted 2be989bb20084ca95810197629d9ea18e</password> + <username>odoo</username> + <password>Encrypted 2be98afc82bdfd8dd9a2ca45acc83f6c3</password> <servername/> <data_tablespace/> <index_tablespace/> @@ -498,22 +498,22 @@ <enabled>Y</enabled> </hop> <hop> - <from>calculate diff</from> - <to>calculate discount</to> + <from>Filter rows</from> + <to>calculate price tier override vendor</to> <enabled>Y</enabled> </hop> <hop> - <from>calculate price tier</from> - <to>calculate diff</to> + <from>calculate price tier override vendor</from> + <to>calculate diff override vendor</to> <enabled>Y</enabled> </hop> <hop> - <from>Filter rows</from> - <to>calculate price tier</to> + <from>calculate diff override vendor</from> + <to>calculate discount override vendor</to> <enabled>Y</enabled> </hop> <hop> - <from>calculate discount</from> + <from>calculate discount override vendor</from> <to>update purchase pricelist override vendor</to> <enabled>Y</enabled> </hop> @@ -529,7 +529,7 @@ <method>none</method> <schema_name/> </partitioning> - <send_true_to>calculate price tier</send_true_to> + <send_true_to>calculate price tier override vendor</send_true_to> <send_false_to>filter override vendor purchase price = 0</send_false_to> <compare> <condition> @@ -593,6 +593,8 @@ b.override_vendor_id as vendor_id, (select group6 from price_group_dw pgd where id = 2) as markup_std6, (select group7 from price_group_dw pgd where id = 2) as markup_std7, (select group8 from price_group_dw pgd where id = 2) as markup_std8, +(select group9 from price_group_dw pgd where id = 2) as markup_std9,--new +(select group10 from price_group_dw pgd where id = 2) as markup_std10,--new (select group1 from price_group_dw pgd where id = 1) as markup_group1, (select group2 from price_group_dw pgd where id = 1) as markup_group2, (select group3 from price_group_dw pgd where id = 1) as markup_group3, @@ -601,6 +603,8 @@ b.override_vendor_id as vendor_id, (select group6 from price_group_dw pgd where id = 1) as markup_group6, (select group7 from price_group_dw pgd where id = 1) as markup_group7, (select group8 from price_group_dw pgd where id = 1) as markup_group8, +(select group9 from price_group_dw pgd where id = 1) as markup_group9,--new +(select group10 from price_group_dw pgd where id = 1) as markup_group10,--new (select group1 from price_group_dw pgd where id = 3) as markup_tier2_1, (select group2 from price_group_dw pgd where id = 3) as markup_tier2_2, (select group3 from price_group_dw pgd where id = 3) as markup_tier2_3, @@ -609,6 +613,8 @@ b.override_vendor_id as vendor_id, (select group6 from price_group_dw pgd where id = 3) as markup_tier2_6, (select group7 from price_group_dw pgd where id = 3) as markup_tier2_7, (select group8 from price_group_dw pgd where id = 3) as markup_tier2_8, +(select group9 from price_group_dw pgd where id = 3) as markup_tier2_9,--new +(select group10 from price_group_dw pgd where id = 3) as markup_tier2_10,--new (select group1 from price_group_dw pgd where id = 4) as markup_tier3_1, (select group2 from price_group_dw pgd where id = 4) as markup_tier3_2, (select group3 from price_group_dw pgd where id = 4) as markup_tier3_3, @@ -617,6 +623,8 @@ b.override_vendor_id as vendor_id, (select group6 from price_group_dw pgd where id = 4) as markup_tier3_6, (select group7 from price_group_dw pgd where id = 4) as markup_tier3_7, (select group8 from price_group_dw pgd where id = 4) as markup_tier3_8, +(select group9 from price_group_dw pgd where id = 4) as markup_tier3_9,--new +(select group10 from price_group_dw pgd where id = 4) as markup_tier3_10,--new (select group1 from price_group_dw pgd where id = 5) as markup_tier4_1, (select group2 from price_group_dw pgd where id = 5) as markup_tier4_2, (select group3 from price_group_dw pgd where id = 5) as markup_tier4_3, @@ -625,6 +633,8 @@ b.override_vendor_id as vendor_id, (select group6 from price_group_dw pgd where id = 5) as markup_tier4_6, (select group7 from price_group_dw pgd where id = 5) as markup_tier4_7, (select group8 from price_group_dw pgd where id = 5) as markup_tier4_8, +(select group9 from price_group_dw pgd where id = 5) as markup_tier4_9,--new +(select group10 from price_group_dw pgd where id = 5) as markup_tier4_10,--new (select group1 from price_group_dw pgd where id = 6) as markup_tier5_1, (select group2 from price_group_dw pgd where id = 6) as markup_tier5_2, (select group3 from price_group_dw pgd where id = 6) as markup_tier5_3, @@ -632,7 +642,9 @@ b.override_vendor_id as vendor_id, (select group5 from price_group_dw pgd where id = 6) as markup_tier5_5, (select group6 from price_group_dw pgd where id = 6) as markup_tier5_6, (select group7 from price_group_dw pgd where id = 6) as markup_tier5_7, -(select group8 from price_group_dw pgd where id = 6) as markup_tier5_8 +(select group8 from price_group_dw pgd where id = 6) as markup_tier5_8, +(select group9 from price_group_dw pgd where id = 6) as markup_tier5_9,--new +(select group10 from price_group_dw pgd where id = 6) as markup_tier5_10--new from product p join brand b on b.id = p.brand_id join res_partner rp on rp.id = b.override_vendor_id @@ -1902,7 +1914,784 @@ where b.purchase_price_exist = 'Y'</sql> </GUI> </step> <step> - <name>calculate diff</name> + <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> <type>Calculator</type> <description/> <distribute>Y</distribute> @@ -1914,12 +2703,12 @@ where b.purchase_price_exist = 'Y'</sql> </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>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> @@ -1929,12 +2718,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>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> @@ -1944,12 +2733,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>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> @@ -1959,12 +2748,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>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> @@ -1974,12 +2763,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>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> @@ -1989,12 +2778,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>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> @@ -2004,12 +2793,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>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> @@ -2019,12 +2808,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>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> @@ -2034,12 +2823,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>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> @@ -2049,12 +2838,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>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> @@ -2064,12 +2853,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2079,12 +2868,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2094,12 +2883,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2109,12 +2898,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2124,12 +2913,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2139,12 +2928,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2154,12 +2943,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2169,12 +2958,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2184,12 +2973,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2199,12 +2988,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2214,12 +3003,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2229,12 +3018,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2244,12 +3033,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2259,12 +3048,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2274,12 +3063,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2289,12 +3078,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2304,12 +3093,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2319,12 +3108,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2334,12 +3123,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2349,12 +3138,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2364,12 +3153,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2379,12 +3168,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>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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2394,12 +3183,12 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2409,12 +3198,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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2424,12 +3213,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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2439,12 +3228,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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2454,12 +3243,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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2469,12 +3258,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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2484,12 +3273,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_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>None</value_type> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2499,12 +3288,312 @@ 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_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>None</value_type> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_1</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_1</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_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> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <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_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_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> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <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_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_6</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_6</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_7</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_7</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_8</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_8</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_9</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier4_10</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier4_10</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_1</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_1</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_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> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <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_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_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> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <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_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_6</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_6</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_7</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_7</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_8</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_8</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_9</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>price_tier5_10</field_name> + <calc_type>PERCENT_3</calc_type> + <field_a>purchase_price</field_a> + <field_b>markup_tier5_10</field_b> + <field_c/> + <value_type>Number</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2523,12 +3612,12 @@ where b.purchase_price_exist = 'Y'</sql> </remotesteps> <GUI> <xloc>576</xloc> - <yloc>256</yloc> + <yloc>128</yloc> <draw>Y</draw> </GUI> </step> <step> - <name>calculate discount</name> + <name>calculate diff override vendor</name> <type>Calculator</type> <description/> <distribute>Y</distribute> @@ -2540,12 +3629,12 @@ where b.purchase_price_exist = 'Y'</sql> </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>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> @@ -2555,12 +3644,12 @@ 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>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> @@ -2570,12 +3659,12 @@ 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>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> @@ -2585,12 +3674,12 @@ 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>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> @@ -2600,12 +3689,12 @@ 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>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> @@ -2615,12 +3704,12 @@ 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>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> @@ -2630,12 +3719,12 @@ 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>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> @@ -2645,12 +3734,12 @@ 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>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> @@ -2660,12 +3749,12 @@ 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>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> @@ -2675,12 +3764,12 @@ 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>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> @@ -2690,12 +3779,12 @@ 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>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> @@ -2705,12 +3794,12 @@ 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>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> @@ -2720,12 +3809,12 @@ 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>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> @@ -2735,12 +3824,12 @@ 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>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> @@ -2750,12 +3839,12 @@ 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>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> @@ -2765,12 +3854,12 @@ 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>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> @@ -2780,12 +3869,12 @@ 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>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> @@ -2795,12 +3884,12 @@ 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>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> @@ -2810,12 +3899,12 @@ 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>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> @@ -2825,12 +3914,12 @@ 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>diff3_10</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc10</field_a> + <field_b>price_tier2_10</field_b> <field_c/> - <value_type>Number</value_type> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -2840,12 +3929,12 @@ 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>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> @@ -2855,12 +3944,12 @@ 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>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> @@ -2870,12 +3959,12 @@ 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>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> @@ -2885,12 +3974,12 @@ 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>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> @@ -2900,12 +3989,12 @@ 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>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> @@ -2915,12 +4004,12 @@ 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>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> @@ -2930,12 +4019,12 @@ 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>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> @@ -2945,12 +4034,12 @@ 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>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> @@ -2960,12 +4049,12 @@ 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>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> @@ -2975,12 +4064,12 @@ 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>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> @@ -2990,12 +4079,12 @@ 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>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> @@ -3005,12 +4094,12 @@ 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>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> @@ -3020,12 +4109,12 @@ 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>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> @@ -3035,12 +4124,12 @@ 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>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> @@ -3050,12 +4139,12 @@ 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>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> @@ -3065,12 +4154,12 @@ 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>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> @@ -3080,12 +4169,12 @@ 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>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> @@ -3095,12 +4184,12 @@ 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>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> @@ -3110,12 +4199,12 @@ 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>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> @@ -3125,12 +4214,162 @@ 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>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> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_1</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc1</field_a> + <field_b>price_tier5_1</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_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>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_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>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_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>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_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>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_6</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc6</field_a> + <field_b>price_tier5_6</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_7</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc7</field_a> + <field_b>price_tier5_7</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_8</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc8</field_a> + <field_b>price_tier5_8</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_9</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc9</field_a> + <field_b>price_tier5_9</field_b> + <field_c/> + <value_type>None</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>diff5_10</field_name> + <calc_type>SUBTRACT</calc_type> + <field_a>price_before_disc10</field_a> + <field_b>price_tier5_10</field_b> + <field_c/> + <value_type>None</value_type> <value_length>-1</value_length> <value_precision>-1</value_precision> <remove>N</remove> @@ -3148,13 +4387,13 @@ where b.purchase_price_exist = 'Y'</sql> </output> </remotesteps> <GUI> - <xloc>736</xloc> - <yloc>256</yloc> + <xloc>576</xloc> + <yloc>352</yloc> <draw>Y</draw> </GUI> </step> <step> - <name>calculate price tier</name> + <name>calculate discount override vendor</name> <type>Calculator</type> <description/> <distribute>Y</distribute> @@ -3166,10 +4405,10 @@ 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>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> @@ -3181,10 +4420,10 @@ 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>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> @@ -3196,10 +4435,10 @@ 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>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> @@ -3211,10 +4450,10 @@ 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>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> @@ -3226,10 +4465,10 @@ 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>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> @@ -3241,10 +4480,10 @@ 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>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> @@ -3256,10 +4495,10 @@ 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>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> @@ -3271,10 +4510,10 @@ 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>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> @@ -3286,10 +4525,10 @@ 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>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> @@ -3301,10 +4540,10 @@ 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>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> @@ -3316,10 +4555,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3331,10 +4570,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3346,10 +4585,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3361,10 +4600,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3376,10 +4615,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3391,10 +4630,10 @@ 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>disc2_6</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_6</field_a> + <field_b>price_before_disc6</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3406,10 +4645,10 @@ 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>disc2_7</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_7</field_a> + <field_b>price_before_disc7</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3421,10 +4660,10 @@ 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>disc2_8</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_8</field_a> + <field_b>price_before_disc8</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3436,10 +4675,10 @@ 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>disc2_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_9</field_a> + <field_b>price_before_disc9</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3451,10 +4690,10 @@ 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>disc2_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff2_10</field_a> + <field_b>price_before_disc10</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3466,10 +4705,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3481,10 +4720,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3496,10 +4735,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3511,10 +4750,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3526,10 +4765,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3541,10 +4780,10 @@ 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>disc3_6</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_6</field_a> + <field_b>price_before_disc6</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3556,10 +4795,10 @@ 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>disc3_7</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_7</field_a> + <field_b>price_before_disc7</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3571,10 +4810,10 @@ 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>disc3_8</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_8</field_a> + <field_b>price_before_disc8</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3586,10 +4825,10 @@ 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>disc3_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_9</field_a> + <field_b>price_before_disc9</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3601,10 +4840,10 @@ 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>disc3_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff3_10</field_a> + <field_b>price_before_disc10</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3616,10 +4855,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3631,10 +4870,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3646,10 +4885,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3661,10 +4900,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3676,10 +4915,10 @@ 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>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>Number</value_type> <value_length>-1</value_length> @@ -3691,10 +4930,10 @@ 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>disc4_6</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_6</field_a> + <field_b>price_before_disc6</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3706,10 +4945,10 @@ 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>disc4_7</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_7</field_a> + <field_b>price_before_disc7</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3721,10 +4960,10 @@ 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>disc4_8</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_8</field_a> + <field_b>price_before_disc8</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3736,10 +4975,10 @@ 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>disc4_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_9</field_a> + <field_b>price_before_disc9</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3751,10 +4990,10 @@ 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>disc4_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff4_10</field_a> + <field_b>price_before_disc10</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3766,10 +5005,10 @@ where b.purchase_price_exist = 'Y'</sql> <currency_symbol/> </calculation> <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>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>Number</value_type> <value_length>-1</value_length> @@ -3781,10 +5020,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>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>Number</value_type> <value_length>-1</value_length> @@ -3796,10 +5035,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>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>Number</value_type> <value_length>-1</value_length> @@ -3811,10 +5050,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>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>Number</value_type> <value_length>-1</value_length> @@ -3826,10 +5065,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>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>Number</value_type> <value_length>-1</value_length> @@ -3841,10 +5080,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>disc5_6</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_6</field_a> + <field_b>price_before_disc6</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3856,10 +5095,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>disc5_7</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_7</field_a> + <field_b>price_before_disc7</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3871,10 +5110,40 @@ 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>disc5_8</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_8</field_a> + <field_b>price_before_disc8</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>disc5_9</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_9</field_a> + <field_b>price_before_disc9</field_b> + <field_c/> + <value_type>Number</value_type> + <value_length>-1</value_length> + <value_precision>-1</value_precision> + <remove>N</remove> + <conversion_mask/> + <decimal_symbol/> + <grouping_symbol/> + <currency_symbol/> + </calculation> + <calculation> + <field_name>disc5_10</field_name> + <calc_type>PERCENT_1</calc_type> + <field_a>diff5_10</field_a> + <field_b>price_before_disc10</field_b> <field_c/> <value_type>Number</value_type> <value_length>-1</value_length> @@ -3894,649 +5163,8 @@ where b.purchase_price_exist = 'Y'</sql> </output> </remotesteps> <GUI> - <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_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_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_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_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_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>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_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_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_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_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_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>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>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>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>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>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>vendor_id</name> - <rename>vendor_id</rename> - </value> - </lookup> - <attributes/> - <cluster_schema/> - <remotesteps> - <input> - </input> - <output> - </output> - </remotesteps> - <GUI> - <xloc>1024</xloc> - <yloc>256</yloc> + <xloc>832</xloc> + <yloc>352</yloc> <draw>Y</draw> </GUI> </step> |