christian/manufacturing_overview
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick fixes for Version 14

Browse Source
This commit is contained in:
Christian Anetzberger
2022-11-09 08:02:29 +01:00
parent bd6d519f17
commit 0619cae23c
2 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manufacturing_overview/manufacturing_overview/api.py
View File

@@ -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)

38
manufacturing_overview/public/js/manufacturing_overview_row.vue
View File

@@ -1,29 +1,21 @@
<template>
<a
@click="pushRoute(link)"
class="row link-item text-wrap ellipsis onbpoard-spotlight"
type="Link"
>
<a @click="pushRoute(link)" class="row link-item text-wrap ellipsis onbpoard-spotlight" type="Link">
<div class="col col-xs-8">
<span
class="indicator-pill no-margin"
v-bind:class="{
<span class="indicator-pill no-margin" v-bind:class="{
red: status === 'No Work Order',
blue: status === 'Partially Delivered',
gray: status === 'Fully Delivered',
green: status === 'In Warehouse',
yellow: status === 'To Produce',
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"
>{{ customer }} -
<a @click="pushRoute('/app#Form/Item/' + item_code)" type="Link">{{
<small v-if="customer && item_code" class="color-secondary">{{ customer }} -
<a @click="pushRoute('/app/item/' + item_code)" type="Link">{{
item_code
}}</a></small
>
}}</a></small>
<small v-else-if="customer" class="color-secondary">{{
customer
}}</small>
@@ -36,22 +28,13 @@
</div>
</div>
<div
v-if="due_in < 0"
class="text-muted ellipsis color-secondary col col-xs-4 text-right"
>
<div 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
v-else-if="due_in === 0"
class="text-muted ellipsis color-secondary col col-xs-4 text-right"
>
<div 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
v-else
class="text-muted ellipsis color-secondary col col-xs-4 text-right"
>
<div 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>