This commit is contained in:
seb
2026-10-17 17:11:11 +02:00
parent 20d83b00fc
commit 01d17ebb25
11 changed files with 450 additions and 372 deletions

View File

@@ -251,18 +251,18 @@ class ManifestFormLine extends PureComponent {
'&:hover': isClickable ? { bgcolor: 'rgba(21, 128, 61, 0.16)' } : undefined,
}
: isPartial
? {
bgcolor: '#d97706',
color: '#ffffff',
border: 'none',
'&:hover': isClickable ? { bgcolor: '#b45309' } : undefined,
}
: {
bgcolor: 'primary.main',
color: '#ffffff',
border: 'none',
'&:hover': isClickable ? { bgcolor: 'primary.dark' } : undefined,
}),
? {
bgcolor: '#d97706',
color: '#ffffff',
border: 'none',
'&:hover': isClickable ? { bgcolor: '#b45309' } : undefined,
}
: {
bgcolor: 'primary.main',
color: '#ffffff',
border: 'none',
'&:hover': isClickable ? { bgcolor: 'primary.dark' } : undefined,
}),
'& .MuiChip-label': {
color: 'inherit',
px: 0.75,
@@ -588,10 +588,10 @@ class ManifestFormLine extends PureComponent {
vkPrice?.net != null
? Number(vkPrice.net)
: cachedArticle.net != null
? Number(cachedArticle.net)
: cachedArticle.price != null
? Number(cachedArticle.price)
: null;
? Number(cachedArticle.net)
: cachedArticle.price != null
? Number(cachedArticle.price)
: null;
const vkTaxRate =
vkPrice?.taxRate ??
vkPrice?.taxrate ??
@@ -601,12 +601,12 @@ class ManifestFormLine extends PureComponent {
19;
const vkBrutto = vkPrice
? priceBrutto(vkPrice) ??
(vkNetto != null && vkTaxRate != null
? Math.round((vkNetto * (1 + Number(vkTaxRate) / 100) + Number.EPSILON) * 100) / 100
: null)
(vkNetto != null && vkTaxRate != null
? Math.round((vkNetto * (1 + Number(vkTaxRate) / 100) + Number.EPSILON) * 100) / 100
: null)
: vkNetto != null
? Math.round((vkNetto * (1 + Number(vkTaxRate) / 100) + Number.EPSILON) * 100) / 100
: null;
? Math.round((vkNetto * (1 + Number(vkTaxRate) / 100) + Number.EPSILON) * 100) / 100
: null;
const suppliers =
Array.isArray(cachedArticle.suppliers) && cachedArticle.suppliers.length > 0
@@ -1206,45 +1206,35 @@ class ManifestFormLine extends PureComponent {
>
<Box sx={{ display: 'flex', alignItems: 'center', gap: 0.25 }}>
{this.props.kind === 'delivery' && Boolean(this.props.onBookLine) && (
<Tooltip
title={
!ledgerLine
? 'Lieferung zuerst speichern, um diese Position zu verbuchen'
: ledgerLine.isBooked
? 'Position bereits verbucht (Klicken zum Einsehen)'
: `Position verbuchen (${ledgerLine.remainingAmount > 0 ? `${ledgerLine.remainingAmount} Stk.` : ''})`
}
>
<span>
<IconButton
size="small"
aria-label="Position verbuchen"
disabled={saving || !ledgerLine}
onClick={(e) => {
e.stopPropagation();
if (ledgerLine) {
this.props.onBookLine(ledgerLine);
}
}}
color={
!ledgerLine
? 'default'
: ledgerLine.isBooked
<span>
<IconButton
size="small"
aria-label="Position verbuchen"
disabled={saving || !ledgerLine}
onClick={(e) => {
e.stopPropagation();
if (ledgerLine) {
this.props.onBookLine(ledgerLine);
}
}}
color={
!ledgerLine
? 'default'
: ledgerLine.isBooked
? 'success'
: ledgerLine.bookedAmount > 0
? 'warning'
: 'primary'
}
sx={{ p: 0.35 }}
>
{ledgerLine?.isBooked ? (
<CheckCircleOutlineOutlinedIcon sx={{ fontSize: 18 }} />
) : (
<Inventory2OutlinedIcon sx={{ fontSize: 18 }} />
)}
</IconButton>
</span>
</Tooltip>
? 'warning'
: 'primary'
}
sx={{ p: 0.35 }}
>
{ledgerLine?.isBooked ? (
<CheckCircleOutlineOutlinedIcon sx={{ fontSize: 18 }} />
) : (
<Inventory2OutlinedIcon sx={{ fontSize: 18 }} />
)}
</IconButton>
</span>
)}
{this.props.onMove && (
<>