Quick fixes for Version 14

manufacturing_overview/manufacturing_overview/api.py

@@ -94,7 +94,11 @@ def generateProductionOverviewCache():
         soItem.delivery_date = formatDate(soItem.delivery_date)
         soItem.warehouseamount = getAmountInWarehouses(soItem.item_code)
 
-        if soItem.warehouseamount >= soItem.qty:
+        if soItem.delivered_qty > 0 and soItem.delivered_qty < soItem.qty:
+            soItem.status = 'Partially Delivered'
+        elif soItem.delivered_qty >= soItem.qty:
+            soItem.status = 'Fully Delivered'
+        elif soItem.warehouseamount >= soItem.qty:
             soItem.status = 'In Warehouse'
         elif len(soItem.wos) != 0:
             soItem.status = 'To Produce'
@@ -103,7 +107,7 @@ def generateProductionOverviewCache():
 
         soItem.qty = soItem.qty - soItem.delivered_qty
 
-        soItem.link = '/app#Form/Sales%20Order/' + soItem.parent
+        soItem.link = '/app/sales-order/' + soItem.parent
 
     frappe.cache().set_value("production_overview", salesOrderItems)
 

manufacturing_overview/public/js/manufacturing_overview_row.vue

@@ -1,34 +1,26 @@
 <template>
-  <a
+  <a @click="pushRoute(link)" class="row link-item text-wrap ellipsis onbpoard-spotlight" type="Link">
-    @click="pushRoute(link)"
-    class="row link-item text-wrap ellipsis onbpoard-spotlight"
-    type="Link"
-  >
     <div class="col col-xs-8">
-      <span
+      <span class="indicator-pill no-margin" v-bind:class="{
-        class="indicator-pill no-margin"
+        red: status === 'No Work Order',
-        v-bind:class="{
+        blue: status === 'Partially Delivered',
-          red: status === 'No Work Order',
+        gray: status === 'Fully Delivered',
-          blue: status === 'Partially Delivered',
+        green: status === 'In Warehouse',
-          green: status === 'In Warehouse',
+        yellow: status === 'To Produce',
-          yellow: status === 'To Produce',
+        grey: status === 'Unknown',
-          grey: status === 'Unknown',
+      }"></span>
-        }"
-      ></span>
       <span class="widget-subtitle">{{ qty }}</span> -
       <span class="widget-title">{{ item_name }}</span>
       <div>
-        <small v-if="customer && item_code" class="color-secondary"
+        <small v-if="customer && item_code" class="color-secondary">{{ customer }} -
-          >{{ customer }} -
+          <a @click="pushRoute('/app/item/' + item_code)" type="Link">{{
-          <a @click="pushRoute('/app#Form/Item/' + item_code)" type="Link">{{
+              item_code
-            item_code
+          }}</a></small>
-          }}</a></small
-        >
         <small v-else-if="customer" class="color-secondary">{{
-          customer
+            customer
         }}</small>
         <small v-else-if="item_code" class="color-secondary">{{
-          item_code
+            item_code
         }}</small>
       </div>
       <div>
@@ -36,22 +28,13 @@
       </div>
     </div>
 
-    <div
+    <div v-if="due_in < 0" class="text-muted ellipsis color-secondary col col-xs-4 text-right">
-      v-if="due_in < 0"
-      class="text-muted ellipsis color-secondary col col-xs-4 text-right"
-    >
       <b style="color: red">{{ delivery_date }}</b>
     </div>
-    <div
+    <div v-else-if="due_in === 0" class="text-muted ellipsis color-secondary col col-xs-4 text-right">
-      v-else-if="due_in === 0"
-      class="text-muted ellipsis color-secondary col col-xs-4 text-right"
-    >
       <b style="color: black">{{ delivery_date }}</b>
     </div>
-    <div
+    <div v-else class="text-muted ellipsis color-secondary col col-xs-4 text-right">
-      v-else
-      class="text-muted ellipsis color-secondary col col-xs-4 text-right"
-    >
       {{ delivery_date }}
     </div>
   </a>
@@ -80,4 +63,5 @@ export default {
 </script>
 
 <style>
+
 </style>