Compare commits

..

No commits in common. "d8862b65c99d683e023ab880c4a45a8a64b9ad84" and "b8adc777a4b08575449730fdca2e67345a7b74c6" have entirely different histories.

6 changed files with 55 additions and 59 deletions

View File

@ -8,11 +8,7 @@ const NewStockAudit = ({ onOk, reset, defaultValues }) => {
<NewObjectForm
type='stockAudit'
reset={reset}
defaultValues={{
state: { type: 'draft' },
auditLines: [],
...defaultValues
}}
defaultValues={{ state: { type: 'draft' }, auditLines: [], ...defaultValues }}
>
{({ handleSubmit, submitLoading, objectData, formValid }) => {
const steps = [
@ -43,7 +39,6 @@ const NewStockAudit = ({ onOk, reset, defaultValues }) => {
_id: false,
_reference: false,
createdAt: false,
postedAt: false,
updatedAt: false,
auditLines: false
}}

View File

@ -1,14 +1,19 @@
import PropTypes from 'prop-types'
import dayjs from 'dayjs'
import ObjectInfo from '../../common/ObjectInfo'
import NewObjectForm from '../../common/NewObjectForm'
import WizardView from '../../common/WizardView'
const defaultTransferName = () =>
`Transfer ${dayjs().format('YYYY-MM-DD HH:mm:ss')}`
const NewStockTransfer = ({ onOk, reset }) => {
return (
<NewObjectForm
type={'stockTransfer'}
reset={reset}
defaultValues={{
name: defaultTransferName(),
state: { type: 'draft' },
lines: []
}}

View File

@ -30,7 +30,7 @@ const PostStockTransfer = ({ onOk, objectData }) => {
return (
<MessageDialogView
title={'Post this stock transfer?'}
description={`Posting will move stock from the transfer's from location to its to location, create destination stock rows, record stock events owned by this transfer, and fill in the "to" stock on each line.`}
description={`Receiving will move stock to the target locations, create destination stock rows, record stock events owned by this transfer, and fill in the "to" stock on each line.`}
onOk={handlePost}
okText='Post'
okLoading={postLoading}

View File

@ -8,11 +8,7 @@ const NewStockAuditLevel = ({ onOk, reset, defaultValues }) => {
<NewObjectForm
type='stockAuditLevel'
reset={reset}
defaultValues={{
auditLines: [],
state: { type: 'draft' },
...defaultValues
}}
defaultValues={{ auditLines: [], ...defaultValues }}
>
{({ handleSubmit, submitLoading, objectData, formValid }) => {
const steps = [
@ -43,8 +39,7 @@ const NewStockAuditLevel = ({ onOk, reset, defaultValues }) => {
_id: false,
_reference: false,
createdAt: false,
updatedAt: false,
auditLines: false
updatedAt: false
}}
isEditing={false}
objectData={objectData}

View File

@ -160,7 +160,7 @@ export const StockAuditLevel = {
name: 'tags',
label: 'Tags',
type: 'tags',
required: true,
required: false,
columnWidth: 200
},
{
@ -217,7 +217,8 @@ export const StockAuditLevel = {
showHyperlink: true,
columnWidth: 220,
disabled: (row) => row?.allItems === true || row?.allSkus === true,
value: (row) => (row?.allItems || row?.allSkus ? null : row?.itemSku),
value: (row) =>
row?.allItems || row?.allSkus ? null : row?.itemSku,
masterFilter: (row) => {
const itemId = row?.item?._id ?? row?.item
if (row?.itemType === 'filament' && itemId) {

View File

@ -140,18 +140,16 @@ export const StockTransfer = {
filters: [
'state',
'state.type',
'fromLocation',
'toLocation',
'postedAt',
'name',
'createdAt',
'updatedAt',
'_reference'
],
sorters: ['createdAt', 'postedAt', 'state', 'updatedAt'],
sorters: ['name', 'createdAt', 'postedAt', 'state', 'updatedAt'],
columns: [
'_reference',
'fromLocation',
'toLocation',
'name',
'state',
'postedAt',
'createdAt',
@ -192,11 +190,12 @@ export const StockTransfer = {
columnWidth: 175
},
{
name: 'state',
label: 'State',
type: 'state',
readOnly: true,
columnWidth: 260
name: 'name',
label: 'Name',
type: 'text',
required: true,
columnWidth: 220,
columnFixed: 'left'
},
{
name: 'postedAt',
@ -206,22 +205,11 @@ export const StockTransfer = {
columnWidth: 175
},
{
name: 'fromLocation',
label: 'From location',
type: 'object',
objectType: 'stockLocation',
showHyperlink: true,
required: true,
columnWidth: 220
},
{
name: 'toLocation',
label: 'To location',
type: 'object',
objectType: 'stockLocation',
showHyperlink: true,
required: true,
columnWidth: 220
name: 'state',
label: 'State',
type: 'state',
readOnly: true,
columnWidth: 260
},
{
@ -230,15 +218,21 @@ export const StockTransfer = {
type: 'objectChildren',
required: false,
canAddRemove: true,
size: 'medium',
columns: [
'fromStockType',
'fromStock',
'quantity',
'toStockLocation',
'toStockType',
'toStock'
],
properties: [
{
name: 'fromStockType',
label: 'Stock type',
label: 'From type',
type: 'objectType',
required: true,
columnWidth: 180,
disabled: (row, parentData) => parentData?.fromLocation?._id == null,
masterFilter: ['filamentStock', 'partStock', 'productStock']
},
{
@ -248,13 +242,7 @@ export const StockTransfer = {
objectType: (row) => row?.fromStockType,
required: true,
showHyperlink: true,
columnWidth: 230,
masterFilter: (_row, parentData) => {
const fromLocation =
parentData?.fromLocation?._id ?? parentData?.fromLocation
if (!fromLocation) return {}
return { stockLocation: fromLocation }
}
columnWidth: 230
},
{
name: 'quantity',
@ -263,12 +251,6 @@ export const StockTransfer = {
required: true,
min: 0,
columnWidth: 140,
disabled: (row, parentData) => {
return (
parentData?.fromLocation?._id == null ||
row?.fromStock?._id == undefined
)
},
suffix: (row) =>
row?.fromStockType === 'filamentStock' ? 'g net' : null
},
@ -304,6 +286,23 @@ export const StockTransfer = {
suffix: (row) =>
row?.fromStockType === 'filamentStock' ? 'g net' : null
},
{
name: 'toStockLocation',
label: 'To location',
type: 'object',
objectType: 'stockLocation',
required: true,
showHyperlink: true,
columnWidth: 230
},
{
name: 'toStockType',
label: 'To type',
type: 'objectType',
readOnly: true,
columnWidth: 180,
visible: (row) => Boolean(row?.toStockType)
},
{
name: 'toStock',
label: 'To stock',
@ -311,7 +310,8 @@ export const StockTransfer = {
objectType: (row) => row?.toStockType,
readOnly: true,
showHyperlink: true,
columnWidth: 230
columnWidth: 230,
visible: (row) => Boolean(row?.toStock)
}
]
}