mirror of
https://github.com/inventree/InvenTree.git
synced 2026-05-28 03:49:20 +00:00
fix merge
This commit is contained in:
@@ -2742,7 +2742,6 @@ order_api_urls = [
|
|||||||
TransferOrderIssue.as_view(),
|
TransferOrderIssue.as_view(),
|
||||||
name='api-transfer-order-issue',
|
name='api-transfer-order-issue',
|
||||||
),
|
),
|
||||||
meta_path(models.TransferOrder),
|
|
||||||
path(
|
path(
|
||||||
'',
|
'',
|
||||||
TransferOrderDetail.as_view(),
|
TransferOrderDetail.as_view(),
|
||||||
@@ -2760,15 +2759,9 @@ order_api_urls = [
|
|||||||
include([
|
include([
|
||||||
path(
|
path(
|
||||||
'<int:pk>/',
|
'<int:pk>/',
|
||||||
include([
|
|
||||||
meta_path(models.TransferOrderLineItem),
|
|
||||||
path(
|
|
||||||
'',
|
|
||||||
TransferOrderLineItemDetail.as_view(),
|
TransferOrderLineItemDetail.as_view(),
|
||||||
name='api-transfer-order-line-detail',
|
name='api-transfer-order-line-detail',
|
||||||
),
|
),
|
||||||
]),
|
|
||||||
),
|
|
||||||
path(
|
path(
|
||||||
'',
|
'',
|
||||||
TransferOrderLineItemList.as_view(),
|
TransferOrderLineItemList.as_view(),
|
||||||
|
|||||||
Reference in New Issue
Block a user