mirror of
https://github.com/inventree/InvenTree.git
synced 2026-04-16 16:28:47 +00:00
Order line number (#11692)
* Add "line number" field for external orders * Updated serializers * Add columns to UI tables * Update form fields * Adds API ordering * Bump API version * Update CHANGELOG.md
This commit is contained in:
@@ -83,6 +83,7 @@ export function extraLineItemFields(): ApiFormFieldSet {
|
||||
order: {
|
||||
hidden: true
|
||||
},
|
||||
line: {},
|
||||
reference: {},
|
||||
description: {},
|
||||
quantity: {},
|
||||
|
||||
@@ -144,6 +144,7 @@ export function usePurchaseOrderLineItemFields({
|
||||
};
|
||||
}
|
||||
},
|
||||
line: {},
|
||||
reference: {},
|
||||
quantity: {
|
||||
onValueChange: (value) => {
|
||||
|
||||
@@ -128,8 +128,9 @@ export function useReturnOrderLineItemFields({
|
||||
part_detail: true
|
||||
}
|
||||
},
|
||||
quantity: {},
|
||||
line: {},
|
||||
reference: {},
|
||||
quantity: {},
|
||||
outcome: {
|
||||
hidden: create == true
|
||||
},
|
||||
|
||||
@@ -169,6 +169,7 @@ export function useSalesOrderLineItemFields({
|
||||
},
|
||||
onValueChange: (_: any, record?: any) => setPart(record)
|
||||
},
|
||||
line: {},
|
||||
reference: {},
|
||||
quantity: {
|
||||
onValueChange: (value) => {
|
||||
|
||||
@@ -767,3 +767,13 @@ export function TotalPriceColumn(): TableColumn {
|
||||
title: t`Total Price`
|
||||
});
|
||||
}
|
||||
|
||||
export function LineItemColumn(props: TableColumnProps): TableColumn {
|
||||
return {
|
||||
accessor: 'line',
|
||||
title: t`Line Item`,
|
||||
sortable: true,
|
||||
switchable: true,
|
||||
...props
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ import { useUserState } from '../../states/UserState';
|
||||
import {
|
||||
DecimalColumn,
|
||||
DescriptionColumn,
|
||||
LineItemColumn,
|
||||
LinkColumn,
|
||||
NoteColumn,
|
||||
ProjectCodeColumn
|
||||
@@ -50,6 +51,7 @@ export default function ExtraLineItemTable({
|
||||
|
||||
const tableColumns: TableColumn[] = useMemo(() => {
|
||||
return [
|
||||
LineItemColumn({}),
|
||||
{
|
||||
accessor: 'reference',
|
||||
switchable: false
|
||||
@@ -177,6 +179,7 @@ export default function ExtraLineItemTable({
|
||||
params: {
|
||||
order: orderId
|
||||
},
|
||||
defaultSortColumn: 'line',
|
||||
rowActions: rowActions,
|
||||
tableActions: tableActions
|
||||
}}
|
||||
|
||||
@@ -36,11 +36,11 @@ import {
|
||||
import useStatusCodes from '../../hooks/UseStatusCodes';
|
||||
import { useTable } from '../../hooks/UseTable';
|
||||
import { useImporterState } from '../../states/ImporterState';
|
||||
import { useGlobalSettingsState } from '../../states/SettingsStates';
|
||||
import { useUserState } from '../../states/UserState';
|
||||
import {
|
||||
CurrencyColumn,
|
||||
DescriptionColumn,
|
||||
LineItemColumn,
|
||||
LinkColumn,
|
||||
LocationColumn,
|
||||
NoteColumn,
|
||||
@@ -74,7 +74,6 @@ export function PurchaseOrderLineItemTable({
|
||||
}>) {
|
||||
const table = useTable('purchase-order-line-item');
|
||||
|
||||
const globalSettings = useGlobalSettingsState();
|
||||
const navigate = useNavigate();
|
||||
const user = useUserState();
|
||||
const openImporter = useImporterState((state) => state.openImporter);
|
||||
@@ -134,6 +133,7 @@ export function PurchaseOrderLineItemTable({
|
||||
|
||||
const tableColumns: TableColumn[] = useMemo(() => {
|
||||
return [
|
||||
LineItemColumn({}),
|
||||
PartColumn({
|
||||
part: 'part_detail',
|
||||
ordering: 'part_name'
|
||||
@@ -435,6 +435,7 @@ export function PurchaseOrderLineItemTable({
|
||||
props={{
|
||||
enableSelection: true,
|
||||
enableDownload: true,
|
||||
defaultSortColumn: 'line',
|
||||
params: {
|
||||
...params,
|
||||
order: orderId,
|
||||
|
||||
@@ -31,6 +31,7 @@ import { useUserState } from '../../states/UserState';
|
||||
import {
|
||||
DateColumn,
|
||||
DescriptionColumn,
|
||||
LineItemColumn,
|
||||
LinkColumn,
|
||||
NoteColumn,
|
||||
PartColumn,
|
||||
@@ -110,6 +111,7 @@ export default function ReturnOrderLineItemTable({
|
||||
|
||||
const tableColumns: TableColumn[] = useMemo(() => {
|
||||
return [
|
||||
LineItemColumn({}),
|
||||
PartColumn({
|
||||
part: 'part_detail',
|
||||
ordering: 'part'
|
||||
@@ -267,6 +269,7 @@ export default function ReturnOrderLineItemTable({
|
||||
item_detail: true,
|
||||
order_detail: true
|
||||
},
|
||||
defaultSortColumn: 'line',
|
||||
enableSelection:
|
||||
inProgress && user.hasChangeRole(UserRoles.return_order),
|
||||
tableActions: tableActions,
|
||||
|
||||
@@ -48,6 +48,7 @@ import {
|
||||
DecimalColumn,
|
||||
DescriptionColumn,
|
||||
IPNColumn,
|
||||
LineItemColumn,
|
||||
LinkColumn,
|
||||
ProjectCodeColumn,
|
||||
ReferenceColumn,
|
||||
@@ -77,6 +78,7 @@ export default function SalesOrderLineItemTable({
|
||||
|
||||
const tableColumns: TableColumn[] = useMemo(() => {
|
||||
return [
|
||||
LineItemColumn({}),
|
||||
{
|
||||
accessor: 'part',
|
||||
sortable: true,
|
||||
@@ -539,6 +541,7 @@ export default function SalesOrderLineItemTable({
|
||||
order: orderId,
|
||||
part_detail: true
|
||||
},
|
||||
defaultSortColumn: 'line',
|
||||
rowActions: rowActions,
|
||||
tableActions: tableActions,
|
||||
tableFilters: tableFilters,
|
||||
|
||||
Reference in New Issue
Block a user