bf deadstock data

2 files changed, 88 insertions, 139 deletions

diff --git a/calculate_no_sales_stock.ktr b/calculate_no_sales_stock.ktr
index 37943d8..17f3076 100644
--- a/calculate_no_sales_stock.ktr
+++ b/calculate_no_sales_stock.ktr
@@ -726,6 +726,47 @@
     </GUI>
   </step>
   <step>
+    <name>Calculator 2</name>
+    <type>Calculator</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <failIfNoFile>Y</failIfNoFile>
+    <calculation>
+      <field_name>new_qty</field_name>
+      <calc_type>SUBTRACT</calc_type>
+      <field_a>qty</field_a>
+      <field_b>qty_outgoing</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>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>736</xloc>
+      <yloc>368</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
     <name>Filter rows</name>
     <type>FilterRows</type>
     <description/>
@@ -1023,39 +1064,30 @@
     <fields>
       <field>
         <name>product_id</name>
-        <rename/>
       </field>
       <field>
         <name>item_code</name>
-        <rename/>
       </field>
       <field>
         <name>product_name</name>
-        <rename/>
       </field>
       <field>
         <name>brand</name>
-        <rename/>
       </field>
       <field>
         <name>qty</name>
-        <rename/>
       </field>
       <field>
         <name>date_added</name>
-        <rename/>
       </field>
       <field>
         <name>in_deadstock</name>
-        <rename/>
       </field>
       <field>
         <name>in_movement</name>
-        <rename/>
       </field>
       <field>
         <name>qty_outgoing</name>
-        <rename/>
       </field>
       <select_unspecified>N</select_unspecified>
     </fields>
@@ -1087,39 +1119,30 @@
     <fields>
       <field>
         <name>product_id</name>
-        <rename/>
       </field>
       <field>
         <name>item_code</name>
-        <rename/>
       </field>
       <field>
         <name>product_name</name>
-        <rename/>
       </field>
       <field>
         <name>brand</name>
-        <rename/>
       </field>
       <field>
         <name>qty</name>
-        <rename/>
       </field>
       <field>
         <name>date_added</name>
-        <rename/>
       </field>
       <field>
         <name>in_deadstock</name>
-        <rename/>
       </field>
       <field>
         <name>in_movement</name>
-        <rename/>
       </field>
       <field>
         <name>qty_outgoing</name>
-        <rename/>
       </field>
       <select_unspecified>N</select_unspecified>
     </fields>
@@ -1151,51 +1174,39 @@
     <fields>
       <field>
         <name>product_id</name>
-        <rename/>
       </field>
       <field>
         <name>item_code</name>
-        <rename/>
       </field>
       <field>
         <name>product_name</name>
-        <rename/>
       </field>
       <field>
         <name>brand</name>
-        <rename/>
       </field>
       <field>
         <name>qty</name>
-        <rename/>
       </field>
       <field>
         <name>date_added</name>
-        <rename/>
       </field>
       <field>
         <name>in_deadstock</name>
-        <rename/>
       </field>
       <field>
         <name>in_movement</name>
-        <rename/>
       </field>
       <field>
         <name>product_id_1</name>
-        <rename/>
       </field>
       <field>
         <name>last_in</name>
-        <rename/>
       </field>
       <field>
         <name>aging</name>
-        <rename/>
       </field>
       <field>
         <name>qty_outgoing</name>
-        <rename/>
       </field>
       <select_unspecified>N</select_unspecified>
     </fields>
@@ -1227,51 +1238,39 @@
     <fields>
       <field>
         <name>product_id</name>
-        <rename/>
       </field>
       <field>
         <name>item_code</name>
-        <rename/>
       </field>
       <field>
         <name>product_name</name>
-        <rename/>
       </field>
       <field>
         <name>brand</name>
-        <rename/>
       </field>
       <field>
         <name>qty</name>
-        <rename/>
       </field>
       <field>
         <name>date_added</name>
-        <rename/>
       </field>
       <field>
         <name>in_deadstock</name>
-        <rename/>
       </field>
       <field>
         <name>in_movement</name>
-        <rename/>
       </field>
       <field>
         <name>product_id_1</name>
-        <rename/>
       </field>
       <field>
         <name>last_in</name>
-        <rename/>
       </field>
       <field>
         <name>aging</name>
-        <rename/>
       </field>
       <field>
         <name>qty_outgoing</name>
-        <rename/>
       </field>
       <select_unspecified>N</select_unspecified>
     </fields>
@@ -1303,19 +1302,15 @@
     <fields>
       <field>
         <name>product_id</name>
-        <rename/>
       </field>
       <field>
         <name>item_code</name>
-        <rename/>
       </field>
       <field>
         <name>product_name</name>
-        <rename/>
       </field>
       <field>
         <name>brand</name>
-        <rename/>
       </field>
       <field>
         <name>new_qty</name>
@@ -1323,23 +1318,18 @@
       </field>
       <field>
         <name>date_added</name>
-        <rename/>
       </field>
       <field>
         <name>last_in</name>
-        <rename/>
       </field>
       <field>
         <name>aging</name>
-        <rename/>
       </field>
       <field>
         <name>last_cost</name>
-        <rename/>
       </field>
       <field>
         <name>total_cost</name>
-        <rename/>
       </field>
       <select_unspecified>N</select_unspecified>
     </fields>
@@ -2259,47 +2249,6 @@ order by sq.product_id</sql>
       <draw>Y</draw>
     </GUI>
   </step>
-  <step>
-    <name>Calculator 2</name>
-    <type>Calculator</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <failIfNoFile>Y</failIfNoFile>
-    <calculation>
-      <field_name>new_qty</field_name>
-      <calc_type>SUBTRACT</calc_type>
-      <field_a>qty</field_a>
-      <field_b>qty_outgoing</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>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>736</xloc>
-      <yloc>368</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
   <step_error_handling>
   </step_error_handling>
   <slave-step-copy-partition-distribution>
diff --git a/update_list_deadstock_opening.ktr b/update_list_deadstock_opening.ktr
index 55f9883..4c8125f 100644
--- a/update_list_deadstock_opening.ktr
+++ b/update_list_deadstock_opening.ktr
@@ -593,10 +593,10 @@
     </partitioning>
     <failIfNoFile>Y</failIfNoFile>
     <calculation>
-      <field_name>new_total_value</field_name>
-      <calc_type>MULTIPLY</calc_type>
+      <field_name>new_qty_available</field_name>
+      <calc_type>SUBTRACT</calc_type>
       <field_a>qty</field_a>
-      <field_b>value</field_b>
+      <field_b>qty_outgoing</field_b>
       <field_c/>
       <value_type>None</value_type>
       <value_length>-1</value_length>
@@ -608,10 +608,10 @@
       <currency_symbol/>
     </calculation>
     <calculation>
-      <field_name>new_qty_available</field_name>
-      <calc_type>SUBTRACT</calc_type>
-      <field_a>qty</field_a>
-      <field_b>qty_outgoing</field_b>
+      <field_name>new_total_value</field_name>
+      <calc_type>MULTIPLY</calc_type>
+      <field_a>new_qty_available</field_a>
+      <field_b>value</field_b>
       <field_c/>
       <value_type>None</value_type>
       <value_length>-1</value_length>
@@ -695,6 +695,46 @@
     </GUI>
   </step>
   <step>
+    <name>If field value is null 2</name>
+    <type>IfNull</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <replaceAllByValue>0</replaceAllByValue>
+    <replaceAllMask/>
+    <selectFields>Y</selectFields>
+    <selectValuesType>N</selectValuesType>
+    <setEmptyStringAll>N</setEmptyStringAll>
+    <valuetypes>
+      </valuetypes>
+    <fields>
+      <field>
+        <name>new_qty_available</name>
+        <value>0</value>
+        <mask/>
+        <set_empty_string>N</set_empty_string>
+      </field>
+    </fields>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>656</xloc>
+      <yloc>304</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
     <name>Merge join</name>
     <type>MergeJoin</type>
     <description/>
@@ -1206,46 +1246,6 @@ order by sq.product_id</sql>
       <draw>Y</draw>
     </GUI>
   </step>
-  <step>
-    <name>If field value is null 2</name>
-    <type>IfNull</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <replaceAllByValue>0</replaceAllByValue>
-    <replaceAllMask/>
-    <selectFields>Y</selectFields>
-    <selectValuesType>N</selectValuesType>
-    <setEmptyStringAll>N</setEmptyStringAll>
-    <valuetypes>
-      </valuetypes>
-    <fields>
-      <field>
-        <name>new_qty_available</name>
-        <value>0</value>
-        <mask/>
-        <set_empty_string>N</set_empty_string>
-      </field>
-    </fields>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>656</xloc>
-      <yloc>304</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
   <step_error_handling>
   </step_error_handling>
   <slave-step-copy-partition-distribution>