commit melhorias compras1
tests / ci (push) Waiting to run

This commit is contained in:
2026-11-21 21:04:40 +02:00
parent 976271f948
commit 12dd6df28a
108 changed files with 4391 additions and 408 deletions
@@ -12,8 +12,10 @@ export type CommercialTerms = {
export function QuotationCommercialTerms({
terms,
currency = 'MZN',
}: {
terms?: CommercialTerms | null;
currency?: string;
}) {
if (!terms) return null;
return (
@@ -25,13 +27,13 @@ export function QuotationCommercialTerms({
{terms.lines.map((line) => (
<p key={line.requisition_item_id}>
Linha #{line.requisition_item_id}: preço inicial{' '}
{money(line.gross_unit_minor)} · desconto{' '}
{money(line.gross_unit_minor, currency)} · desconto{' '}
{line.discount_type === 'none'
? 'sem desconto'
: line.discount_type === 'percent'
? `${line.discount_value}%`
: `${line.discount_value} MZN/unidade`}{' '}
· preço líquido {money(line.net_unit_minor)}
: `${line.discount_value} ${currency}/unidade`}{' '}
· preço líquido {money(line.net_unit_minor, currency)}
</p>
))}
</div>
@@ -0,0 +1,160 @@
import { useForm } from '@inertiajs/react';
import { FormErrors, Panel, controlClass } from '@/components/procurement';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
export type ExchangeBasis = {
id: number;
currency: string;
rate: string;
quoted_on: string;
source: string;
recorded_by: number;
};
export function ExchangeSummary({ basis }: { basis: ExchangeBasis }) {
return (
<div className="space-y-1 text-sm">
<p>
1 {basis.currency} = {basis.rate} MZN · Taxa de{' '}
{basis.quoted_on}
</p>
<p className="whitespace-pre-wrap">Fonte: {basis.source}</p>
<p>
Taxa congelada neste processo por Finanças (utilizador #
{basis.recorded_by}). Subtotal e IVA convertidos separadamente e
arredondados ao centavo.
</p>
</div>
);
}
export function QuotationExchangePanel({
requisitionId,
rates,
canRecord,
}: {
requisitionId: number;
rates: ExchangeBasis[];
canRecord: boolean;
}) {
const form = useForm({
operation_id: crypto.randomUUID(),
currency: '',
rate: '',
quoted_on: '',
source: '',
});
return (
<Panel
title="Taxas de câmbio do processo"
description="Finanças informa a taxa para MZN, com data e fonte. Cada moeda fica congelada neste processo. Os valores originais da proposta são conservados; comparação, alçadas e orçamento usam a referência em MZN."
>
<p className="mb-4 text-sm">
Este percurso usa valores monetários com duas casas decimais.
Não há consulta automática de taxas nem conversão bancária.
</p>
<div className="space-y-4">
{rates.map((rate) => (
<ExchangeSummary key={rate.id} basis={rate} />
))}
</div>
{rates.length === 0 && (
<p className="text-sm">
Sem taxa estrangeira registada. Propostas em MZN mantêm o
percurso habitual.
</p>
)}
{canRecord && (
<form
className="mt-5 space-y-4"
onSubmit={(event) => {
event.preventDefault();
form.post(
`/requisicoes/${requisitionId}/taxas-cambio`,
{
preserveScroll: true,
onSuccess: () => {
form.reset();
form.setData(
'operation_id',
crypto.randomUUID(),
);
},
},
);
}}
>
<FormErrors errors={form.errors} />
<div className="grid gap-4 md:grid-cols-3">
<div>
<Label htmlFor="exchange-currency">
Moeda original (código de 3 letras)
</Label>
<Input
id="exchange-currency"
required
pattern="[A-Z]{3}"
maxLength={3}
value={form.data.currency}
onChange={(event) =>
form.setData(
'currency',
event.target.value.toUpperCase(),
)
}
/>
</div>
<div>
<Label htmlFor="exchange-rate">
MZN por unidade da moeda original
</Label>
<Input
id="exchange-rate"
required
inputMode="decimal"
value={form.data.rate}
onChange={(event) =>
form.setData('rate', event.target.value)
}
/>
</div>
<div>
<Label htmlFor="exchange-date">Data da taxa</Label>
<Input
id="exchange-date"
type="date"
required
value={form.data.quoted_on}
onChange={(event) =>
form.setData(
'quoted_on',
event.target.value,
)
}
/>
</div>
</div>
<div>
<Label htmlFor="exchange-source">Fonte da taxa</Label>
<textarea
id="exchange-source"
className={controlClass}
required
minLength={3}
maxLength={1000}
value={form.data.source}
onChange={(event) =>
form.setData('source', event.target.value)
}
/>
</div>
<Button disabled={form.processing}>
Registar e congelar taxa
</Button>
</form>
)}
</Panel>
);
}
@@ -0,0 +1,70 @@
import { Input } from '@/components/ui/input';
export function convertedQuantity(milli: string): string {
if (!/^\d+$/.test(milli)) return 'Não disponível';
const padded = milli.padStart(4, '0');
return `${padded.slice(0, -3)},${padded.slice(-3)}`;
}
export type ReceiptConversion = {
numerator: string;
denominator: string;
source: string;
version: string;
};
export function ReceiptConversionFields({
value,
onChange,
documentUnit,
stockUnit,
}: {
value: ReceiptConversion;
onChange: (value: ReceiptConversion) => void;
documentUnit: string;
stockUnit: string;
}) {
return (
<fieldset className="space-y-3 rounded border p-3">
<legend>
Conversão de {documentUnit} para {stockUnit}
</legend>
<p className="text-sm">
A compra conserva {documentUnit}. O stock e os lotes usam{' '}
{stockUnit}. O factor, fonte e versão ficam congelados nesta
linha.
</p>
{(
[
['numerator', 'Numerador'],
['denominator', 'Denominador'],
['source', 'Fonte do factor'],
['version', 'Versão da fonte'],
] as const
).map(([key, label]) => (
<label className="block space-y-1" key={key}>
<span>{label}</span>
<Input
required
value={value[key]}
maxLength={
key === 'source' ? 500 : key === 'version' ? 100 : 9
}
pattern={
key === 'numerator' || key === 'denominator'
? '[1-9][0-9]{0,8}'
: undefined
}
onChange={(event) =>
onChange({ ...value, [key]: event.target.value })
}
/>
</label>
))}
<p className="text-xs">
Quantidade física = quantidade aceite × numerador ÷ denominador.
Não há arredondamento automático.
</p>
</fieldset>
);
}
+34 -10
View File
@@ -36,7 +36,11 @@ type Invoice = {
subtotal_minor: number;
tax_minor: number;
total_minor: number;
snapshot: { supplier: { name: string }; order_number: string };
snapshot: {
supplier: { name: string };
order_number: string;
currency?: string;
};
items: {
id: number;
quantity_milli: number;
@@ -57,7 +61,13 @@ export default function Invoices({
focusOrderId = null,
}: {
invoices: Page<Invoice>;
orders: { id: number; number: string; supplier: string; items: Source[] }[];
orders: {
id: number;
number: string;
currency?: string;
supplier: string;
items: Source[];
}[];
canManage: boolean;
focusInvoiceId?: number | null;
focusOrderId?: number | null;
@@ -342,10 +352,9 @@ export default function Invoices({
<label key={key}>
{
{
subtotal:
'Subtotal sem IVA (MZN)',
tax: 'IVA (MZN)',
total: 'Total (MZN)',
subtotal: `Subtotal sem IVA (${order?.currency ?? 'MZN'})`,
tax: `IVA (${order?.currency ?? 'MZN'})`,
total: `Total (${order?.currency ?? 'MZN'})`,
}[key]
}
<Input
@@ -386,9 +395,21 @@ export default function Invoices({
: 'Pendente de validação'}
</p>
<p>
Subtotal {money(invoice.subtotal_minor)} · IVA{' '}
{money(invoice.tax_minor)} · Total{' '}
{money(invoice.total_minor)}
Subtotal{' '}
{money(
invoice.subtotal_minor,
invoice.snapshot.currency,
)}{' '}
· IVA{' '}
{money(
invoice.tax_minor,
invoice.snapshot.currency,
)}{' '}
· Total{' '}
{money(
invoice.total_minor,
invoice.snapshot.currency,
)}
</p>
{payablesAvailable && (
<p className="my-3">
@@ -418,7 +439,10 @@ export default function Invoices({
{l.snapshot.description} ·{' '}
{l.quantity_milli / 1000}{' '}
{l.snapshot.unit} ·{' '}
{money(l.subtotal_minor + l.tax_minor)}
{money(
l.subtotal_minor + l.tax_minor,
invoice.snapshot.currency,
)}
</li>
))}
</ul>
+77 -8
View File
@@ -13,6 +13,14 @@ import type { Page } from '@/types/inventory';
import { money } from '@/types/procurement';
type Invoice = {
banks?: {
id: number;
revision: number;
label: string;
currency: string;
state: string;
}[];
currency?: string;
id: number;
number: string;
supplier_id: number;
@@ -135,9 +143,14 @@ export default function Payments({
{i.number} · {i.supplier_name}
</p>
<p>
Total {money(i.total_minor)} · Confirmado{' '}
{money(i.total_minor - i.outstanding_minor)}{' '}
· Pendente {money(i.outstanding_minor)}
Total {money(i.total_minor, i.currency)} ·
Confirmado{' '}
{money(
i.total_minor - i.outstanding_minor,
i.currency,
)}{' '}
· Pendente{' '}
{money(i.outstanding_minor, i.currency)}
</p>
<p>
{i.outstanding_minor === 0
@@ -214,20 +227,75 @@ export default function Payments({
.map((i) => (
<option key={i.id} value={i.id}>
{i.number} · {i.supplier_name} ·{' '}
{money(i.outstanding_minor)}
{money(
i.outstanding_minor,
i.currency,
)}
</option>
))}
</select>
</label>
{selected?.banks && (
<label>
Conta bancária na moeda da factura
<select
className={controlClass}
required
value={
form.data.supplier_bank_detail_id ||
''
}
onChange={(event) =>
form.setData(
'supplier_bank_detail_id',
Number(event.target.value),
)
}
>
<option value="">
Seleccione uma conta validada
</option>
{selected.banks.map((bank) => (
<option
key={bank.id}
value={bank.id}
disabled={
bank.state !== 'approved'
}
>
{bank.label} ·{' '}
{bank.state === 'approved'
? 'Validada'
: 'Por concluir'}
</option>
))}
</select>
{selected.banks.length === 0 && (
<p className="mt-2 text-sm">
Não há conta disponível na moeda
desta factura. Consulte os dados
bancários do fornecedor.
</p>
)}
</label>
)}
{selected && (
<p className="text-sm">
Versão bancária seleccionada:{' '}
{selected.bank_revision}. Se os dados
mudarem, a confirmação será bloqueada.
{selected.banks?.find(
(bank) =>
bank.id ===
form.data.supplier_bank_detail_id,
)?.revision ??
(selected.bank_revision ||
'Por seleccionar')}
. Se os dados mudarem, a confirmação será
bloqueada.
</p>
)}
<label>
Montante do pagamento (MZN)
Montante do pagamento (
{selected?.currency ?? 'MZN'})
<Input
required
inputMode="decimal"
@@ -296,7 +364,8 @@ export default function Payments({
title={`Registo externo #${p.id} · ${invoices.find((i) => i.id === p.invoice_id)?.number ?? `Factura #${p.invoice_id}`}`}
>
<p>
{money(p.amount_minor)} · {p.paid_on} ·{' '}
{money(p.amount_minor, p.currency)} ·{' '}
{p.paid_on} ·{' '}
{{
pending: 'Pendente de conferência',
confirmed: 'Confirmado',
+16 -3
View File
@@ -114,7 +114,17 @@ export default function Award({
)}
</td>
<td className="pr-4 whitespace-nowrap">
{money(q.total_minor)}
{money(q.total_minor, q.currency)}
{q.reference_amounts &&
q.exchange_basis && (
<p className="text-xs">
Referência para alçadas:{' '}
{money(
q.reference_amounts
.total_minor,
)}
</p>
)}
</td>
<td className="pr-4">
{q.evaluation_count} /{' '}
@@ -199,8 +209,11 @@ export default function Award({
.map((q) => (
<option key={q.id} value={q.id}>
{q.supplier.name} ·{' '}
{money(q.total_minor)} ·{' '}
{q.score?.toFixed(2)} / 10
{money(
q.total_minor,
q.currency,
)}{' '}
· {q.score?.toFixed(2)} / 10
</option>
))}
</select>
@@ -7,6 +7,8 @@ import type { AiPreparation } from '@/components/ai-preparation-preview';
import { ComparisonPolicySummary } from '@/components/comparison-policy-summary';
import type { ComparisonPolicy } from '@/components/comparison-policy-summary';
import { QuotationCommercialTerms } from '@/components/quotation-commercial-terms';
import { ExchangeSummary } from '@/components/quotation-exchange-panel';
import type { ExchangeBasis } from '@/components/quotation-exchange-panel';
import type { CommercialTerms } from '@/components/quotation-commercial-terms';
import { PageTitle, Panel, Status } from '@/components/procurement';
import { Button } from '@/components/ui/button';
@@ -33,6 +35,12 @@ type Analysis = {
answers: Answer[];
};
type ComparisonRow = {
exchange_basis?: ExchangeBasis;
reference_amounts?: {
subtotal_minor: number;
tax_minor: number;
total_minor: number;
} | null;
commercial_terms?: CommercialTerms | null;
id: number;
reference: string;
@@ -208,6 +216,11 @@ export default function ReviewReport({
<Printer className="size-4" />
Imprimir esta consulta
</Button>
<Button asChild variant="outline">
<a href={`/requisicoes/${r.id}/relatorio.csv`}>
Exportar conferência completa (CSV)
</a>
</Button>
</div>
}
/>
@@ -399,7 +412,24 @@ export default function ReviewReport({
</strong>
<QuotationCommercialTerms
terms={row.commercial_terms}
currency={row.currency}
/>
{row.exchange_basis && (
<ExchangeSummary
basis={row.exchange_basis}
/>
)}
{row.reference_amounts && (
<p className="text-sm">
Referência para comparação e
alçadas:{' '}
{money(
row.reference_amounts
.total_minor,
'MZN',
)}
</p>
)}
</section>
))}
{report.comparison.rows.map((row) => (
+27 -7
View File
@@ -5,6 +5,7 @@ import { QuotationCommercialTerms } from '@/components/quotation-commercial-term
import { PageTitle, Panel } from '@/components/procurement';
import { Button } from '@/components/ui/button';
import { date, money, roleLabels } from '@/types/procurement';
import { ExchangeSummary } from '@/components/quotation-exchange-panel';
import type { PurchaseOrder } from '@/types/purchase';
import OrderCancellationRequest, {
type OrderCancellationState,
@@ -196,13 +197,19 @@ export default function OrderShow({
{Number(item.quantity)} {item.unit}
</td>
<td className="pr-4 whitespace-nowrap">
{money(item.unit_price_minor)}
{money(
item.unit_price_minor,
order.currency,
)}
</td>
<td className="pr-4">
{Number(item.tax_rate)}%
</td>
<td className="whitespace-nowrap">
{money(item.total_minor)}
{money(
item.total_minor,
order.currency,
)}
</td>
</tr>
))}
@@ -212,17 +219,28 @@ export default function OrderShow({
<dl className="mt-5 ml-auto max-w-sm space-y-3 text-sm">
<div className="flex justify-between gap-4">
<dt>Subtotal sem IVA</dt>
<dd>{money(order.subtotal_minor)}</dd>
<dd>
{money(order.subtotal_minor, order.currency)}
</dd>
</div>
<div className="flex justify-between gap-4">
<dt>IVA</dt>
<dd>{money(order.tax_minor)}</dd>
<dd>{money(order.tax_minor, order.currency)}</dd>
</div>
<div className="flex justify-between gap-4 border-t pt-3 font-semibold">
<dt>Total com IVA</dt>
<dd>{money(order.total_minor)}</dd>
<dd>{money(order.total_minor, order.currency)}</dd>
</div>
</dl>
{snapshot.exchange_basis && (
<ExchangeSummary basis={snapshot.exchange_basis} />
)}
{snapshot.reference_amounts && (
<p className="mt-3 text-sm">
Referência orçamental:{' '}
{money(snapshot.reference_amounts.total_minor)}
</p>
)}
</Panel>
<Panel title="Fundamento e matriz congelada">
{snapshot.comparison_policy && (
@@ -246,11 +264,13 @@ export default function OrderShow({
: `${row.score.toFixed(2)} / 10`}
</p>
<p className="mt-1 text-muted-foreground">
{money(row.total_minor)} com IVA ·{' '}
{row.evaluation_count} avaliações elegíveis
{money(row.total_minor, row.currency)} com
IVA · {row.evaluation_count} avaliações
elegíveis
</p>
<QuotationCommercialTerms
terms={row.commercial_terms}
currency={row.currency}
/>
{row.evaluations.map((e) => (
<p
+85 -9
View File
@@ -14,6 +14,11 @@ import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { money } from '@/types/procurement';
import {
ExchangeSummary,
QuotationExchangePanel,
} from '@/components/quotation-exchange-panel';
import type { ExchangeBasis } from '@/components/quotation-exchange-panel';
type Item = {
id: number;
@@ -33,6 +38,13 @@ type Evaluation = {
created_at: string;
};
type Quote = {
currency: string;
exchange_basis: ExchangeBasis | null;
reference_amounts: {
subtotal_minor: number;
tax_minor: number;
total_minor: number;
} | null;
canEvaluate: boolean;
id: number;
reference: string;
@@ -62,6 +74,9 @@ export default function Comparison({
ready,
topIds,
comparisonPolicy,
exchangeRates = [],
exchangeAvailable = false,
canRecordExchange = false,
}: {
requisition: {
id: number;
@@ -78,10 +93,14 @@ export default function Comparison({
ready: boolean;
topIds: number[];
comparisonPolicy: ComparisonPolicy;
exchangeRates?: ExchangeBasis[];
exchangeAvailable?: boolean;
canRecordExchange?: boolean;
}) {
const [adding, setAdding] = useState(prepare && canCreate);
const [selected, setSelected] = useState<number | null>(focusQuotationId);
const form = useForm({
currency: 'MZN',
supplier_id: '',
reference: '',
delivery_days: '1',
@@ -195,7 +214,7 @@ export default function Comparison({
<div id="quotation-create">
<Panel
title="Nova proposta"
description="MZN · Quantidades e IVA herdados da requisição. Desconto por unidade antes do IVA; preço líquido arredondado ao centavo antes de multiplicar pela quantidade. Preencha todas as linhas."
description="Valores na moeda seleccionada, com duas casas decimais. Quantidades e IVA herdados da requisição. Desconto por unidade antes do IVA; preço líquido arredondado ao centavo antes de multiplicar pela quantidade. Preencha todas as linhas."
>
<form
className="space-y-5"
@@ -213,6 +232,31 @@ export default function Comparison({
}}
>
<FormErrors errors={form.errors} />
<Label htmlFor="quotation-currency">
Moeda original da proposta
</Label>
<select
id="quotation-currency"
className={controlClass}
value={form.data.currency}
onChange={(event) =>
form.setData(
'currency',
event.target.value,
)
}
>
<option value="MZN">MZN</option>
{exchangeRates.map((rate) => (
<option
key={rate.id}
value={rate.currency}
>
{rate.currency} · taxa {rate.rate}{' '}
MZN
</option>
))}
</select>
<div className="grid gap-4 md:grid-cols-2">
<div className="space-y-2">
<Label htmlFor="supplier">
@@ -304,7 +348,8 @@ export default function Comparison({
htmlFor={`price-${i.id}`}
>
Preço unitário antes de
desconto e IVA (MZN)
desconto e IVA (
{form.data.currency})
</Label>
<Input
id={`price-${i.id}`}
@@ -385,7 +430,8 @@ export default function Comparison({
Percentagem (%)
</option>
<option value="amount">
Valor por unidade (MZN)
Valor por unidade (
{form.data.currency})
</option>
</select>
</label>
@@ -393,7 +439,7 @@ export default function Comparison({
{form.data.items[index]
.discount_type === 'percent'
? 'Percentagem (%)'
: 'Valor unitário (MZN)'}
: `Valor unitário (${form.data.currency})`}
<Input
type="number"
min="0"
@@ -459,6 +505,13 @@ export default function Comparison({
</Panel>
</div>
)}
{exchangeAvailable && (
<QuotationExchangePanel
requisitionId={requisition.id}
rates={exchangeRates}
canRecord={canRecordExchange}
/>
)}
<Panel
title="Matriz de comparação"
description="Ponderações da regra deste processo. Preço e prazo calculados automaticamente entre propostas elegíveis."
@@ -507,13 +560,28 @@ export default function Comparison({
)}
</td>
<td className="pr-4 whitespace-nowrap">
{money(q.subtotal_minor)}
{money(
q.subtotal_minor,
q.currency,
)}
</td>
<td className="pr-4 whitespace-nowrap">
{money(q.tax_minor)}
{money(q.tax_minor, q.currency)}
</td>
<td className="pr-4 whitespace-nowrap">
{money(q.total_minor)}
{money(q.total_minor, q.currency)}
{q.exchange_basis &&
q.reference_amounts && (
<p className="text-xs">
Referência:{' '}
{money(
q.reference_amounts
.total_minor,
)}{' '}
· Taxa{' '}
{q.exchange_basis.rate}
</p>
)}
</td>
<td className="pr-4">
{q.delivery_days} dias
@@ -571,13 +639,21 @@ export default function Comparison({
)}
<QuotationCommercialTerms
terms={q.commercial_terms}
currency={q.currency}
/>
{q.exchange_basis && (
<ExchangeSummary basis={q.exchange_basis} />
)}
<div className="space-y-3">
{q.items.map((i) => (
<p className="text-sm" key={i.id}>
{i.description} · {i.quantity} ×{' '}
{money(i.unit_price_minor)} · total
com IVA {money(i.total_minor)}
{money(
i.unit_price_minor,
q.currency,
)}{' '}
· total com IVA{' '}
{money(i.total_minor, q.currency)}
</p>
))}
</div>
+91 -1
View File
@@ -1,4 +1,6 @@
import { Head, Link, useForm } from '@inertiajs/react';
import { ReceiptConversionFields } from '@/components/receipt-conversion';
import type { ReceiptConversion } from '@/components/receipt-conversion';
import { InventoryNotice, ReceiptProgressTable } from '@/components/inventory';
import {
FormErrors,
@@ -25,6 +27,7 @@ type Line = {
quality_status: string;
notes: string;
stock_item_id: string;
conversion: ReceiptConversion;
lots: {
code: string;
expires_on: string;
@@ -40,6 +43,7 @@ type Props = {
warehouses: Warehouse[];
stockItems: StockItem[];
canConfirm: boolean;
conversionQaEnabled?: boolean;
lotScopes: {
stock_item_id: number;
warehouse_id: number;
@@ -54,6 +58,7 @@ export default function ReceiveOrder({
warehouses,
stockItems,
canConfirm,
conversionQaEnabled = false,
lotScopes,
}: Props) {
const form = useForm({
@@ -69,6 +74,12 @@ export default function ReceiveOrder({
quality_status: 'compliant',
notes: '',
stock_item_id: line.stock_item_id ? String(line.stock_item_id) : '',
conversion: {
numerator: '',
denominator: '',
source: '',
version: '',
},
lots: [] as Line['lots'],
})),
});
@@ -120,6 +131,25 @@ export default function ReceiveOrder({
...line
}) => ({
...line,
conversion:
conversionQaEnabled &&
stockItems.some(
(item) =>
String(item.id) ===
line.stock_item_id &&
item.unit.toLowerCase() !==
progress.lines
.find(
(
source,
) =>
source.id ===
line.purchase_order_item_id,
)
?.unit.toLowerCase(),
)
? line.conversion
: undefined,
stock_item_id:
line.stock_item_id || null,
}),
@@ -445,8 +475,9 @@ export default function ReceiveOrder({
(
item,
) =>
conversionQaEnabled ||
item.unit.toLowerCase() ===
source.unit.toLowerCase(),
source.unit.toLowerCase(),
)
.map(
(
@@ -471,6 +502,65 @@ export default function ReceiveOrder({
),
)}
</select>
{conversionQaEnabled &&
stockItems.some(
(
item,
) =>
String(
item.id,
) ===
form
.data
.items[
index
]
.stock_item_id &&
item.unit.toLowerCase() !==
source.unit.toLowerCase(),
) && (
<ReceiptConversionFields
value={
form
.data
.items[
index
]
.conversion
}
onChange={(
conversion,
) =>
change(
index,
{
conversion,
},
)
}
documentUnit={
source.unit
}
stockUnit={
stockItems.find(
(
item,
) =>
String(
item.id,
) ===
form
.data
.items[
index
]
.stock_item_id,
)
?.unit ??
''
}
/>
)}
</div>
) : (
<p className="self-center text-sm text-muted-foreground">
+34
View File
@@ -1,4 +1,5 @@
import { Head, Link } from '@inertiajs/react';
import { convertedQuantity } from '@/components/receipt-conversion';
import { InventoryNotice } from '@/components/inventory';
import { PageTitle, Panel } from '@/components/procurement';
import { date } from '@/types/procurement';
@@ -101,6 +102,39 @@ export default function ReceiptShow({
Rejeitado: {quantity(line.rejected_milli)}{' '}
{line.snapshot.order_item.unit}
</p>
{line.snapshot.quantity_conversion && (
<p className="mt-2 text-sm">
Entrada física:{' '}
{convertedQuantity(
line.snapshot.quantity_conversion
.accepted_stock_milli,
)}{' '}
{
line.snapshot.quantity_conversion
.stock_unit
}{' '}
· factor{' '}
{
line.snapshot.quantity_conversion
.numerator
}
/
{
line.snapshot.quantity_conversion
.denominator
}{' '}
·
{
line.snapshot.quantity_conversion
.source
}{' '}
· versão{' '}
{
line.snapshot.quantity_conversion
.version
}
</p>
)}
<p className="mt-2 text-muted-foreground">
{line.snapshot.stock_item
? `${line.snapshot.stock_item.code} · ${line.snapshot.stock_item.name}`
+5 -1
View File
@@ -78,6 +78,7 @@ type Props = {
stock_item_id: number;
warehouse_id: number;
accepted_milli: number;
physical_accepted_milli?: number;
returned_milli: number;
label: string;
}[];
@@ -216,7 +217,10 @@ function Prepare({ props, old }: { props: Props; old?: RecordEntry }) {
{receipts.map((r) => (
<option key={r.id} value={r.id}>
{r.label} · Devolvível da origem:{' '}
{quantity(r.accepted_milli - r.returned_milli)}
{quantity(
(r.physical_accepted_milli ??
r.accepted_milli) - r.returned_milli,
)}
</option>
))}
</select>
+74 -3
View File
@@ -1,4 +1,5 @@
import { Head, Link, useForm } from '@inertiajs/react';
import { useState } from 'react';
import {
FormErrors,
Panel,
@@ -20,6 +21,16 @@ type Detail = {
reason: string;
};
type Props = {
accountKey?: string | null;
actorId?: number;
multiAccountsAvailable?: boolean;
accounts?: {
id: number;
key: string | null;
revision: number;
label: string;
state: string;
}[];
supplier: { id: number; name: string };
current: Detail | null;
currentId: number;
@@ -39,7 +50,16 @@ type Props = {
canPropose: boolean;
canReview: boolean;
};
export default function Bank({
export default function BankPage(props: Props) {
return (
<Bank
key={`${props.supplier.id}:${props.accountKey ?? 'legacy'}:${props.actorId ?? 0}:${props.canPropose}:${props.canReview}`}
{...props}
/>
);
}
function Bank({
supplier,
current,
currentId,
@@ -48,9 +68,14 @@ export default function Bank({
reviews,
canPropose,
canReview,
accountKey = null,
accounts = [],
multiAccountsAvailable = false,
}: Props) {
const [addingAccount, setAddingAccount] = useState(false);
const form = useForm({
previous_id: currentId,
account_key: accountKey,
bank_name: '',
country: '',
currency: '',
@@ -93,9 +118,51 @@ export default function Bank({
<Link href={`/fornecedores/${supplier.id}`}>
← Ficha do fornecedor
</Link>
{multiAccountsAvailable && (
<Panel
title="Contas do fornecedor"
description="Cada conta conserva as suas versões e duas validações independentes. Adicionar outra conta não substitui nem reactiva versões anteriores."
>
<div className="flex flex-wrap gap-3">
{accounts.map((account) => (
<Link
key={account.id}
className="rounded border p-3 text-sm"
href={`/fornecedores/${supplier.id}/dados-bancarios${account.key === null ? '' : `?account=${encodeURIComponent(account.key)}`}`}
>
{account.label} ·{' '}
{states[account.state] ?? account.state}
</Link>
))}
</div>
{canPropose && (
<Button
className="mt-4"
variant="outline"
onClick={() => {
const add = !addingAccount;
setAddingAccount(add);
form.reset();
form.clearErrors();
form.setData((data) => ({
...data,
previous_id: add ? 0 : currentId,
account_key: add
? crypto.randomUUID()
: accountKey,
}));
}}
>
{addingAccount
? 'Rever a conta seleccionada'
: 'Adicionar conta independente'}
</Button>
)}
</Panel>
)}
<Panel
title={states[state] ?? state}
description="A versão mais recente substitui a anterior para efeitos de disponibilidade. A aprovação não confirma a titularidade junto do banco nem valida formatos bancários nacionais."
description="A versão mais recente desta conta substitui a sua anterior para efeitos de disponibilidade. A aprovação não confirma a titularidade junto do banco nem valida formatos bancários nacionais."
>
{current && (
<dl className="grid gap-4 text-sm sm:grid-cols-2">
@@ -181,7 +248,11 @@ export default function Bank({
)}
{canPropose && (
<Panel
title="Propor nova versão"
title={
addingAccount
? 'Propor conta independente'
: 'Propor nova versão da conta seleccionada'
}
description="Preencha integralmente os dados confirmados. A nova versão exige duas validações novas; a versão anterior permanece no histórico."
>
<form
+9
View File
@@ -37,6 +37,15 @@ export type ReceiptItem = {
stock_item: StockItem | null;
warehouse: Warehouse | null;
physical: boolean;
quantity_conversion?: {
document_unit: string;
stock_unit: string;
numerator: string;
denominator: string;
source: string;
version: string;
accepted_stock_milli: string;
};
};
};
export type Receipt = {
+2 -2
View File
@@ -94,10 +94,10 @@ export const priorityLabels: Record<string, string> = {
high: 'Alta',
urgent: 'Urgente',
};
export const money = (minor: number) =>
export const money = (minor: number, currency = 'MZN') =>
new Intl.NumberFormat('pt-MZ', {
style: 'currency',
currency: 'MZN',
currency,
}).format(minor / 100);
export const date = (value: string) =>
new Intl.DateTimeFormat('pt-MZ').format(
+14
View File
@@ -1,7 +1,15 @@
import type { CommercialTerms } from '@/components/quotation-commercial-terms';
import type { ComparisonPolicy } from '@/components/comparison-policy-summary';
import type { ExchangeBasis } from '@/components/quotation-exchange-panel';
export type MatrixRow = {
currency?: string;
exchange_basis?: ExchangeBasis | null;
reference_amounts?: {
subtotal_minor: number;
tax_minor: number;
total_minor: number;
} | null;
commercial_terms?: CommercialTerms | null;
id: number;
reference: string;
@@ -70,6 +78,12 @@ export type PurchaseOrder = {
total_minor: number;
items: OrderItem[];
snapshot: {
exchange_basis?: ExchangeBasis;
reference_amounts?: {
subtotal_minor: number;
tax_minor: number;
total_minor: number;
};
comparison_policy?: ComparisonPolicy;
investment_rules?: {
id: number;
@@ -1,6 +1,6 @@
@if(!empty($terms))
<p class="small">Desconto por unidade antes do IVA; preço líquido arredondado ao centavo.</p>
@foreach($terms['lines'] as $line)
<p class="small">Linha #{{ $line['requisition_item_id'] }}: preço inicial {{ $money($line['gross_unit_minor']) }} · desconto {{ $line['discount_type'] === 'none' ? 'sem desconto' : ($line['discount_type'] === 'percent' ? $line['discount_value'].'%' : $line['discount_value'].' MZN/unidade') }} · preço líquido {{ $money($line['net_unit_minor']) }}.</p>
<p class="small">Linha #{{ $line['requisition_item_id'] }}: preço inicial {{ $money($line['gross_unit_minor']) }} · desconto {{ $line['discount_type'] === 'none' ? 'sem desconto' : ($line['discount_type'] === 'percent' ? $line['discount_value'].'%' : $line['discount_value'].' '.($currency ?? 'MZN').'/unidade') }} · preço líquido {{ $money($line['net_unit_minor']) }}.</p>
@endforeach
@endif
@@ -0,0 +1,6 @@
@if(!empty($basis))
<p class="small">Taxa congelada da proposta {{ $reference }}: 1 {{ $basis['currency'] }} = {{ $basis['rate'] }} MZN · {{ $basis['quoted_on'] }} · Fonte: {{ $basis['source'] }} · Finanças, utilizador #{{ $basis['recorded_by'] }}. Subtotal e IVA convertidos separadamente, com arredondamento ao centavo.</p>
@if(!empty($referenceAmounts))
<p class="small">Referência para comparação e alçadas: {{ number_format($referenceAmounts['total_minor'] / 100, 2, ',', ' ') }} MZN.</p>
@endif
@endif
@@ -32,6 +32,9 @@
<table><thead><tr><th>Nome</th><th>Qualidade</th><th>Participação</th><th>Assinatura manuscrita</th></tr></thead><tbody>
@foreach($opening->participants as $participant)<tr><td>{{ $participant['name'] }}</td><td>{{ $participant['capacity'] }}</td><td>{{ $participant['group'] === 'jury' ? 'Júri' : 'Participante' }}</td><td class="signature">____________________</td></tr>@endforeach
</tbody></table>
@foreach($snapshot['proposals'] as $proposal)
@include('purchases.exchange-basis', ['basis' => $proposal['exchange_basis'] ?? null, 'reference' => $proposal['reference'], 'referenceAmounts' => null])
@endforeach
<h2>Mapa das propostas registadas na aplicação</h2>
<p>Valores preservados à data deste registo, para conferência com os dados da sessão. Não inclui propostas adicionadas ou alteradas posteriormente.</p>
<table><thead><tr><th>Ordem</th><th>Concorrente e referência</th><th>Sem IVA</th><th>IVA</th><th>Total</th></tr></thead><tbody>
+7 -4
View File
@@ -20,9 +20,12 @@
</style>
</head>
<body>
@php($money = fn ($minor) => number_format($minor / 100, 2, ',', '.') . ' MZN')
@php($money = fn ($minor, $currency = null) => number_format($minor / 100, 2, ',', '.') . ' ' . ($currency ?? $order->currency))
<button type="button" class="no-print" onclick="window.print()">Imprimir ou guardar como PDF</button>
<h1>Ordem de compra {{ $order->number }}</h1>
@if(!empty($snapshot['exchange_basis']))
<p>Taxa congelada: 1 {{ $snapshot['exchange_basis']['currency'] }} = {{ $snapshot['exchange_basis']['rate'] }} MZN · {{ $snapshot['exchange_basis']['quoted_on'] }} · Fonte: {{ $snapshot['exchange_basis']['source'] }}. Referência orçamental: {{ $money($snapshot['reference_amounts']['total_minor'], 'MZN') }}. Os valores da ordem estão na moeda original.</p>
@endif
@if(($operationalState ?? 'issued') !== 'issued')
<p class="notice"><strong>{{ $operationalState === 'cancelled' ? 'Ordem cancelada' : 'Cancelamento pendente — execução suspensa' }}.</strong> Reprodução do documento original, preservado no histórico.</p>
@endif
@@ -35,7 +38,7 @@
<h2>Artigos e valores</h2>
@if(!empty($snapshot['investment_rules']))
<h2>Regra de investimento congelada</h2>
<p>Versão {{ $snapshot['investment_rules']['revision'] }} · Tecto {{ $money($snapshot['investment_rules']['ceiling_minor']) }} · {{ $snapshot['investment_rules']['includes_tax'] ? 'com IVA' : 'sem IVA' }} · Vigência {{ $snapshot['investment_rules']['valid_from'] }} a {{ $snapshot['investment_rules']['valid_until'] }}.</p>
<p>Versão {{ $snapshot['investment_rules']['revision'] }} · Tecto {{ $money($snapshot['investment_rules']['ceiling_minor'], 'MZN') }} · {{ $snapshot['investment_rules']['includes_tax'] ? 'com IVA' : 'sem IVA' }} · Vigência {{ $snapshot['investment_rules']['valid_from'] }} a {{ $snapshot['investment_rules']['valid_until'] }}.</p>
@foreach($snapshot['equipment_requests'] ?? [] as $context)<p class="pre">{{ $context['description'] }} · Área: {{ $context['production_area'] }}</p>@endforeach
@endif
<table><thead><tr><th>Descrição</th><th>Quantidade</th><th>Preço sem IVA</th><th>IVA</th><th>Total com IVA</th></tr></thead><tbody>
@@ -46,7 +49,7 @@
@foreach($snapshot['decision_matrix'] as $row)
@if(!empty($row['commercial_terms']))
<h3>{{ $row['supplier']['name'] }} · {{ $row['reference'] }}</h3>
@include('purchases.commercial-terms', ['terms' => $row['commercial_terms']])
@include('purchases.commercial-terms', ['terms' => $row['commercial_terms'], 'currency' => $row['currency'], 'money' => fn ($minor) => number_format($minor / 100, 2, ',', '.') . ' ' . $row['currency']])
@endif
@endforeach
<table class="totals"><tr><td>Subtotal sem IVA</td><td>{{ $money($order->subtotal_minor) }}</td></tr><tr><td>IVA</td><td>{{ $money($order->tax_minor) }}</td></tr><tr><th>Total com IVA</th><th>{{ $money($order->total_minor) }}</th></tr></table>
@@ -57,7 +60,7 @@
@endif
<table><thead><tr><th>Fornecedor / proposta</th><th>Total com IVA</th><th>Avaliações elegíveis</th><th>Pontuação</th></tr></thead><tbody>
@foreach($snapshot['decision_matrix'] as $row)
<tr><td>{{ $row['supplier']['name'] }} · {{ $row['reference'] }}<br>@foreach($row['evaluations'] as $evaluation)<span class="small">Avaliador #{{ $evaluation['evaluator_id'] }}: qualidade {{ $evaluation['quality'] }}, histórico {{ $evaluation['history'] }}, pagamento {{ $evaluation['payment'] }}. {{ $evaluation['comment'] }}</span><br>@endforeach</td><td>{{ $money($row['total_minor']) }}</td><td>{{ $row['evaluation_count'] }}</td><td>{{ $row['score'] === null ? 'Não elegível / incompleta' : number_format($row['score'], 2, ',', '.') . ' / 10' }}</td></tr>
<tr><td>{{ $row['supplier']['name'] }} · {{ $row['reference'] }}<br>@foreach($row['evaluations'] as $evaluation)<span class="small">Avaliador #{{ $evaluation['evaluator_id'] }}: qualidade {{ $evaluation['quality'] }}, histórico {{ $evaluation['history'] }}, pagamento {{ $evaluation['payment'] }}. {{ $evaluation['comment'] }}</span><br>@endforeach</td><td>{{ $money($row['total_minor'], $row['currency']) }}</td><td>{{ $row['evaluation_count'] }}</td><td>{{ $row['score'] === null ? 'Não elegível / incompleta' : number_format($row['score'], 2, ',', '.') . ' / 10' }}</td></tr>
@endforeach
</tbody></table>
<h2>Aprovações do valor final</h2><ul>@foreach($snapshot['final_approvals'] as $approval)<li>{{ \App\Enums\PurchasingRole::from($approval['role'])->label() }} · Utilizador #{{ $approval['approver_id'] }} · {{ $approval['decided_at'] }} · {{ $approval['comment'] }}</li>@endforeach</ul>
@@ -39,6 +39,9 @@
<tr><td>{{ $row['supplier_name'] }} · {{ $row['reference'] }}</td><td>{{ number_format($row['total_minor'] / 100, 2, ',', ' ') }} {{ $row['currency'] }}</td><td>{{ $row['evaluation_count'] }}</td><td>{{ $row['score_minor'] === null ? 'Por concluir' : number_format($row['score_minor'] / 100, 2, ',', ' ') }}</td><td>{{ $row['eligible'] ? 'Elegível, com admissão confirmada' : implode(' ', $row['ineligibility_reasons']) }}{{ in_array($row['id'], $attempt->snapshot['basis']['top_ids'], true) ? ' · Maior pontuação' : '' }}</td></tr>
@endforeach
</tbody></table>
@foreach($rows as $row)
@include('purchases.exchange-basis', ['basis' => $row['exchange_basis'] ?? null, 'reference' => $row['reference'], 'referenceAmounts' => $row['reference_amounts'] ?? null])
@endforeach
<h2>Referências de admissão preservadas</h2>
@foreach($attempt->snapshot['basis']['admissions'] as $admission)
<p>Proposta #{{ $admission['quotation_id'] }} · requisitos #{{ $admission['basis']['set_id'] ?? 'não disponíveis' }} · decisão #{{ $admission['decision']['id'] ?? 'não disponível' }} · conferências {{ implode(', ', array_column($admission['reviews'], 'id')) ?: 'sem registos' }}.</p>
+6
View File
@@ -39,6 +39,12 @@
<tr>
<td>{{ $item->snapshot['order_item']['description'] }} · {{ $item->snapshot['order_item']['unit'] }}
@if($item->snapshot['stock_item'] ?? null)<br>{{ $item->snapshot['stock_item']['code'] }}@endif
@if(isset($item->snapshot['quantity_conversion']))
@php($conversion = $item->snapshot['quantity_conversion'])
<p>Stock: {{ str_replace('.', ',', (string)\Brick\Math\BigDecimal::of($conversion['accepted_stock_milli'])->dividedBy(1000, 3)) }} {{ $conversion['stock_unit'] }};
factor {{ $conversion['numerator'] }}/{{ $conversion['denominator'] }};
{{ $conversion['source'] }} · versão {{ $conversion['version'] }}.</p>
@endif
@if(isset($corrections[$item->id]))<p><strong>Estornado integralmente: {{ $corrections[$item->id]->data['reference'] }}</strong></p>@endif
</td>
<td>{{ $quantity($item->received_milli) }}</td><td>{{ $quantity($item->accepted_milli) }}</td><td>{{ $quantity($item->rejected_milli) }}</td>