inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 19:46:46 +00:00
Code

[PUI] Tweaks for part purchase order table (#8319)

Browse Source 
* Improve API query

* Table ordering fixes for PartPurchaseOrdersTable
This commit is contained in:
Oliver 2024-10-20 15:01:05 +11:00 committed by GitHub
parent 29726d8d0d
commit 90f726e325
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/InvenTree/order/api.py
View File

@ -550,6 +550,7 @@ class PurchaseOrderLineItemList(
'SKU': 'part__SKU', 'SKU': 'part__SKU',
'part_name': 'part__part__name', 'part_name': 'part__part__name',
'order': 'order__reference', 'order': 'order__reference',
'status': 'order__status',
'complete_date': 'order__complete_date', 'complete_date': 'order__complete_date',
} }
@ -564,6 +565,7 @@ class PurchaseOrderLineItemList(
'total_price', 'total_price',
'target_date', 'target_date',
'order', 'order',
'status',
'complete_date', 'complete_date',
] ]

3
src/frontend/src/tables/ColumnRenderers.tsx
View File

@ -174,6 +174,7 @@ export function ProjectCodeColumn(props: TableColumnProps): TableColumn {
export function StatusColumn({ export function StatusColumn({
model, model,
sortable, sortable,
ordering,
accessor, accessor,
title, title,
hidden hidden
@ -181,12 +182,14 @@ export function StatusColumn({
model: ModelType; model: ModelType;
sortable?: boolean; sortable?: boolean;
accessor?: string; accessor?: string;
ordering?: string;
hidden?: boolean; hidden?: boolean;
title?: string; title?: string;
}) { }) {
return { return {
accessor: accessor ?? 'status', accessor: accessor ?? 'status',
sortable: sortable ?? true, sortable: sortable ?? true,
ordering: ordering,
title: title, title: title,
hidden: hidden, hidden: hidden,
render: TableStatusRenderer(model, accessor ?? 'status_custom_key') render: TableStatusRenderer(model, accessor ?? 'status_custom_key')

8
src/frontend/src/tables/part/PartPurchaseOrdersTable.tsx
View File

@ -25,6 +25,7 @@ export default function PartPurchaseOrdersTable({
return [ return [
ReferenceColumn({ ReferenceColumn({
accessor: 'order_detail.reference', accessor: 'order_detail.reference',
ordering: 'order',
sortable: true, sortable: true,
switchable: false, switchable: false,
title: t`Purchase Order` title: t`Purchase Order`
@ -32,6 +33,7 @@ export default function PartPurchaseOrdersTable({
StatusColumn({ StatusColumn({
accessor: 'order_detail.status', accessor: 'order_detail.status',
sortable: true, sortable: true,
ordering: 'status',
title: t`Status`, title: t`Status`,
model: ModelType.purchaseorder model: ModelType.purchaseorder
}), }),
@ -55,6 +57,7 @@ export default function PartPurchaseOrdersTable({
}, },
{ {
accessor: 'quantity', accessor: 'quantity',
sortable: true,
switchable: false, switchable: false,
render: (record: any) => { render: (record: any) => {
let supplier_part = record?.supplier_part_detail ?? {}; let supplier_part = record?.supplier_part_detail ?? {};
@ -100,6 +103,11 @@ export default function PartPurchaseOrdersTable({
accessor: 'target_date', accessor: 'target_date',
title: t`Target Date` title: t`Target Date`
}), }),
DateColumn({
accessor: 'order_detail.complete_date',
ordering: 'complete_date',
title: t`Completion Date`
}),
{ {
accessor: 'purchase_price', accessor: 'purchase_price',
render: (record: any) => render: (record: any) =>