admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'Purchase_Invoice_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Weidget_Dashboard_Services

Browse Source
This commit is contained in:
Kartik Sharma 2025-12-04 15:07:22 +05:30
commit 51db1193ce
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Project/ProjectNav.jsx
View File

@ -27,6 +27,7 @@ const ProjectNav = ({ onPillClick, activePill }) => {
const ProjectTab = [ const ProjectTab = [
{ key: "profile", icon: "bx bx-user", label: "Profile" }, { key: "profile", icon: "bx bx-user", label: "Profile" },
{ key: "organization", icon: "bx bx-buildings", label: "Organization" },
{ key: "teams", icon: "bx bx-group", label: "Teams" }, { key: "teams", icon: "bx bx-group", label: "Teams" },
{ {
key: "infra", key: "infra",
@ -41,7 +42,7 @@ const ProjectNav = ({ onPillClick, activePill }) => {
hidden: !(DirAdmin || DireManager || DirUser), hidden: !(DirAdmin || DireManager || DirUser),
}, },
{ key: "documents", icon: "bx bx-folder-open", label: "Documents", hidden: !(isViewDocuments || isModifyDocument || isUploadDocument) }, { key: "documents", icon: "bx bx-folder-open", label: "Documents", hidden: !(isViewDocuments || isModifyDocument || isUploadDocument) },
{ key: "organization", icon: "bx bx-buildings", label: "Organization" },
{ key: "setting", icon: "bx bxs-cog", label: "Setting", hidden: !isManageTeam }, { key: "setting", icon: "bx bxs-cog", label: "Setting", hidden: !isManageTeam },
]; ];
return ( return (

2
src/components/purchase/DeliverChallanList.jsx
View File

@ -40,7 +40,7 @@ const DeliverChallanList = ({ purchaseId, viewDocuments }) => {
<div className="d-flex justify-content-between"> <div className="d-flex justify-content-between">
<p className="mb-1 fw-semibold">{item.deliveryChallanNumber}</p> <p className="mb-1 fw-semibold">{item.deliveryChallanNumber}</p>
<small className="text-muted text-end"> <small className="text-muted text-end">
{formatUTCToLocalTime(item.deliveryChallanDate, true)} {formatUTCToLocalTime(item.deliveryChallanDate)}
</small> </small>
</div> </div>