New_REP_SYSTEM/ERP-core
8
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix: resolve import conflict in purchase order detail page

Browse Source
This commit is contained in:
Sasanka20
2026-08-05 12:21:01 +05:30
parent 02f47bd485
commit d1fe164ea2
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx
-5
View File
@@ -3,12 +3,7 @@
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import { useParams, useRouter } from "next/navigation" import { useParams, useRouter } from "next/navigation"
import Link from "next/link" import Link from "next/link"
<<<<<<< HEAD
import { AlertTriangle, Ban, Plus, Save, Send, Trash2 } from "lucide-react"
=======
import { AlertTriangle, ArrowLeft, Ban, Check, Plus, Save, Trash2 } from "lucide-react" import { AlertTriangle, ArrowLeft, Ban, Check, Plus, Save, Trash2 } from "lucide-react"
>>>>>>> 5d0ea3f (feat: enhance purchase orders management with delete and approve actions)
import { isPoEditable, purchaseOrdersApi } from "@/lib/api/purchase-orders" import { isPoEditable, purchaseOrdersApi } from "@/lib/api/purchase-orders"
import { warehousesApi } from "@/lib/api/warehouses" import { warehousesApi } from "@/lib/api/warehouses"
import { itemsApi } from "@/lib/api/items" import { itemsApi } from "@/lib/api/items"