Commit Graph

115 Commits

Author SHA1 Message Date
ImanThiyanga b7bd8dca5c Merge pull request 'Dev' (#20) from Dev into production
Reviewed-on: #20
2026-07-31 05:24:39 +00:00
ImanThiyanga cb3f1e5cde Merge branch 'production' into Dev 2026-07-31 05:24:32 +00:00
ImanThiyanga c3fef88bcf Merge pull request 'feat: add production templates API and documentation for manufacturing phase 2' (#19) from feat/production-integration into Dev
Reviewed-on: #19
2026-07-31 04:54:00 +00:00
ImanThiyanga 7d6e597389 feat: add production templates API and documentation for manufacturing phase 2
- Implemented CRUD operations for production templates, including listing, retrieving, creating, updating, and deactivating templates.
- Introduced a new API contract for production runs, detailing the lifecycle from creation to completion, including handling of stock inputs and outputs.
- Documented the architecture, requirements, entity model, and API contract for the manufacturing phase 2, ensuring clarity on the production process and its integration with existing systems.
2026-07-31 10:22:40 +05:30
ImanThiyanga 415ac94ab2 Merge pull request 'Dashborad and prouction' (#18) from Dashborad-and-prouction into Dev
Reviewed-on: #18
2026-07-29 17:08:57 +00:00
Sasanka 4561ef7ba8 feat: implement frontend-only mock for production lines and runs
- Add ProductionTemplatesPage component for managing production templates with a visual representation using React Flow.
- Create LineHeaderNode and LineStageNode components for rendering production line nodes.
- Introduce RunStageNode and RunHeaderNode components for displaying run stages and headers.
- Implement StageProgressStrip for visualizing stage progress in runs.
- Create mock data for production runs and templates to simulate backend functionality.
- Define types for production templates and runs to structure mock data.
- Document frontend Phase 2 specifications for manufacturing processes, including screens, dialogs, and validation posture.
2026-07-28 22:55:56 +05:30
Sasanka b12adebaa0 feat: add dashboard overview stats endpoint and UI integration
- Implemented `GET /dashboard/stats` in `DashboardController` to provide aggregate counts for stock, GRN, and procurement.
- Created `DashboardStatsDto` and `WarehouseValuationDto` to structure the response data.
- Developed `DashboardService` to fetch and compute necessary statistics from the database.
- Added `IDashboardService` interface for service abstraction.
- Introduced API client methods in `dashboard.ts` for frontend consumption of the new endpoint.
- Defined TypeScript types for dashboard data in `dashboard.ts` to ensure type safety in the frontend.
- Updated UI components in the frontend to reflect changes in the dashboard, including styling adjustments and removal of unused icons.
2026-07-28 14:59:09 +05:30
ImanThiyanga 0b95d6f1cd Merge pull request 'feat: enhance UI components and add vibrant theme support' (#17) from ui-fixers into Dev
Reviewed-on: #17
2026-07-27 06:10:10 +00:00
ImanThiyanga d35b076435 Merge branch 'Dev' into ui-fixers 2026-07-27 06:10:00 +00:00
Sasanka c564916c60 feat: enhance UI components and add vibrant theme support
- Updated layout and styling for various dashboard pages including stock adjustments, counts, transfers, wastage, and vendors to improve responsiveness and visual consistency.
- Introduced a vibrant theme option in the theme toggle component, allowing users to switch between light, dark, and vibrant themes.
- Refactored button styles across login and forgot password pages for better accessibility and visual feedback.
- Improved sidebar navigation with expanded functionality for items without dedicated pages.
- Enhanced data table styling for better readability and user interaction.
- Added new background images to support the vibrant theme.
2026-07-27 11:11:26 +05:30
Dhananjaya99 86bb4d4908 Merge branch 'Dev' of https://gitea.hexdive.com/New_REP_SYSTEM/ERP-core into Dev 2026-07-24 14:33:55 +05:30
Dhananjaya99 816ffbbfb6 setting not found issue 2026-07-24 14:33:49 +05:30
ashan_rusiru ae20bc4e34 Merge pull request 'develop full initial module' (#16) from Feature_HRM into Dev
Reviewed-on: #16
2026-07-24 05:25:13 +00:00
Dhananjaya99 755df494fe develop full initial module 2026-07-23 19:54:56 +05:30
Dhananjaya99 eacc21afad Merge branch 'fixers-7/23' into Dev 2026-07-23 13:02:24 +05:30
Sasanka 7366ca93c0 feat: implement theme toggle and enhance UI components 2026-07-23 12:53:26 +05:30
ImanThiyanga 5af77fbf0a Merge pull request 'feat: Implement fixed sale price functionality for items' (#14) from fix/grn-varient into Dev
Reviewed-on: #14
2026-07-23 06:48:46 +00:00
ImanThiyanga a1b3985469 feat: Implement fixed sale price functionality for items
- Added a toggle for fixed sale price vs stock value in the item creation form.
- Introduced validation to ensure all variants have a price greater than 0 when fixed price mode is selected.
- Updated the item model to include a nullable salePrice field, which is used for sales only and does not affect GRN/FIFO/ledger.
- Enhanced the GRN page to allow off-PO items and included a refresh button to update the item list without reloading the page.
- Updated documentation to reflect changes in item pricing and GRN handling.
2026-07-23 12:12:32 +05:30
ImanThiyanga 5cf9588728 role code error fixed 2026-07-22 16:14:49 +05:30
ImanThiyanga 8484601494 Merge pull request 'Dev' (#13) from Dev into production
Reviewed-on: #13
2026-07-22 06:12:34 +00:00
ImanThiyanga 9260b4de9b Merge branch 'production' into Dev 2026-07-22 06:12:28 +00:00
ImanThiyanga 46e971ef25 Merge pull request 'Feat/po grn' (#12) from feat/po-GRN into Dev
Reviewed-on: #12
2026-07-21 11:04:58 +00:00
ImanThiyanga f8b9ee8f6c Merge branch 'feat/po-GRN' of https://gitea.hexdive.com/New_REP_SYSTEM/ERP-core into feat/po-GRN 2026-07-21 16:27:05 +05:30
ImanThiyanga 4108062416 ui fixes 2026-07-21 16:26:32 +05:30
ImanThiyanga 03bc85b788 feat(procurement): enhance purchase order and GRN functionalities
- Updated purchase order descriptions for clarity on draft and submission processes.
- Implemented submit and delete functionalities for draft purchase orders, allowing users to manage their orders more effectively.
- Added discount and VAT fields to GRN lines, enabling better cost tracking and reporting.
- Enhanced validation for GRN lines to ensure discount and VAT percentages are within acceptable ranges.
- Updated API to support new functionalities, including submitting and deleting purchase orders.
- Improved UI components for better user experience in managing purchase orders and GRNs.
- Documented changes in security and backend phase documentation to reflect new processes and requirements.
2026-07-21 16:26:32 +05:30
ImanThiyanga 9158cd8c82 ui fixes 2026-07-21 11:55:40 +05:30
ImanThiyanga 951961b798 Merge pull request 'feat: enhance product management features' (#11) from products-fixers into Dev
Reviewed-on: #11
2026-07-21 04:40:18 +00:00
ImanThiyanga f02c89b3cb feat(procurement): enhance purchase order and GRN functionalities
- Updated purchase order descriptions for clarity on draft and submission processes.
- Implemented submit and delete functionalities for draft purchase orders, allowing users to manage their orders more effectively.
- Added discount and VAT fields to GRN lines, enabling better cost tracking and reporting.
- Enhanced validation for GRN lines to ensure discount and VAT percentages are within acceptable ranges.
- Updated API to support new functionalities, including submitting and deleting purchase orders.
- Improved UI components for better user experience in managing purchase orders and GRNs.
- Documented changes in security and backend phase documentation to reflect new processes and requirements.
2026-07-21 10:08:32 +05:30
Sasanka 295ec5799f feat: enhance product management features
- Implement sorting and filtering for categories in the dashboard.
- Add status filtering and sorting capabilities for categories.
- Introduce warehouse selection and base UOM configuration in the new item creation page.
- Fetch and display brands and subcategories in the items page.
- Update product settings to manage subcategories and brands.
- Refactor sidebar navigation to include configuration options.
2026-07-20 17:11:13 +05:30
ImanThiyanga fe9e8a780f ui updated 2026-07-20 12:00:03 +05:30
Dhananjaya99 92c4b14a6c add rbac 2026-07-18 23:42:58 +05:30
ashan_rusiru 80b130dffb Merge pull request 'Feat/be inventory' (#10) from feat/be-inventory into Dev
Reviewed-on: #10
2026-07-18 08:38:47 +00:00
ImanThiyanga 62a5d857de Complete all for Items 2026-07-17 14:27:51 +05:30
ImanThiyanga f72b24fcaa completed invetory updates 2026-07-17 00:23:33 +05:30
ImanThiyanga 7c5faabc2d ath fix 2026-07-16 14:23:23 +05:30
ImanThiyanga 582782b0fe Merge pull request 'feat: add brands and variant categories management' (#8) from inventry-and-supply-chain-management into Dev
Reviewed-on: #8
2026-07-16 05:35:18 +00:00
ImanThiyanga 250cf89abb Merge branch 'Dev' into inventry-and-supply-chain-management 2026-07-16 05:35:12 +00:00
Sasanka c9a84e235b feat: add brands and variant categories management
- Implemented CRUD operations for brands and variant categories in the API.
- Created UI components for managing brands and variant categories, including listing, creating, editing, and deleting.
- Enhanced the sidebar navigation to include links for brands and variant categories.
- Updated the categories API to support pagination and filtering.
- Added validation for brand and variant category names.
- Integrated toast notifications for user feedback on actions.
2026-07-15 18:11:35 +05:30
ImanThiyanga baaf51ba99 Merge pull request 'Dev' (#7) from Dev into production
Reviewed-on: #7
2026-07-15 10:08:07 +00:00
ImanThiyanga 5d18d5d576 Merge branch 'production' into Dev 2026-07-15 10:08:02 +00:00
ImanThiyanga ed2ee87c68 Refactor code structure for int in alll ids instesd defult using long 2026-07-15 15:35:54 +05:30
ImanThiyanga 6c7f53350f Merge pull request 'Inventry and supply chain management' (#6) from inventry-and-supply-chain-management into Dev
Reviewed-on: #6
2026-07-15 08:04:34 +00:00
Sasanka 0e4bcf174b Refactor API client and remove unused code
- Removed the ApiError class and related functions from the api-client module.
- Updated vendor detail page to handle errors without the ApiError class.
- Refactored various API modules to use in-memory mock data instead of commented-out fetch implementations.
- Removed the auth-token module as it was no longer needed.
- Updated error handling to use a more generic error structure.
- Adjusted common types to include ApiResult interface for better type management.
2026-07-15 10:28:14 +05:30
Sasanka cb9fd7dfa8 Revert "Refactor API modules to remove mock implementations and integrate real endpoints"
This reverts commit
2026-07-15 10:27:38 +05:30
ImanThiyanga 4b2914cd5d Merge pull request 'Add migration to add auth_user_id column to users table' (#5) from fix/phase-01 into Dev
Reviewed-on: #5
2026-07-14 11:02:51 +00:00
ImanThiyanga ae7627fcf2 Merge branch 'Dev' into fix/phase-01 2026-07-14 11:02:44 +00:00
ImanThiyanga 67150425e4 Add migration to add auth_user_id column to users table
- Introduced a new column 'auth_user_id' of type UUID to the 'users' table.
- Updated existing user data to set 'auth_user_id' to null for UserId 1.
- Created a unique index on 'auth_user_id' to enforce uniqueness.
- Implemented rollback functionality to remove the column and index if needed.
2026-07-14 16:30:45 +05:30
Sasanka 0415794473 Refactor API modules to remove mock implementations and integrate real endpoints
- Updated stock-transfers.ts to replace mock data with API requests for stock transfers.
- Refactored stock.ts to utilize API calls for stock inquiries instead of mock data.
- Modified uoms.ts to implement real API requests for unit of measure operations.
- Transitioned vendors.ts to use actual API endpoints for vendor management, removing mock data handling.
- Updated warehouses.ts to replace mock implementations with real API calls for warehouse and bin management.
- Refactored wastage.ts to utilize stock adjustments and reason codes APIs, removing mock data dependencies.
- Adjusted procurement.ts to align with backend DTO shapes, ensuring consistency with planned backend structures.
2026-07-14 16:01:47 +05:30
ImanThiyanga 9e1aa57987 Merge pull request 'feat: Add new services and interfaces for GRN, Purchase Return, Reason Code, Reorder, Stock, and Transfer functionalities' (#3) from fix/phase-01 into Dev
Reviewed-on: #3
2026-07-14 05:12:25 +00:00
ImanThiyanga 22f86451e3 feat: Add new services and interfaces for GRN, Purchase Return, Reason Code, Reorder, Stock, and Transfer functionalities
- Implemented IGrnService for managing goods receipts including retrieval, creation, and confirmation.
- Created IPurchaseReturnService for handling purchase return operations.
- Added IReasonCodeService for managing reason codes with listing and creation capabilities.
- Developed IReorderService for fetching reorder alerts and creating suggested requisitions.
- Introduced IStockMutator for applying stock changes and posting ledger entries.
- Established IStockService for stock inquiries, ledger retrieval, and valuation.
- Created ITransferService for managing inter-warehouse transfers including dispatch and receiving operations.
- Implemented PurchaseReturnService to handle purchase return logic and stock adjustments.
- Developed ReasonCodeService for listing and creating reason codes.
- Created ReorderService for fetching reorder alerts and generating requisitions.
- Implemented FifoCostingService for FIFO cost-layer management and ledger writing.
- Developed StockMutator for applying stock deltas and posting ledger entries.
- Created StockService for stock inquiries and ledger management.
- Implemented TransferService for managing inter-warehouse transfers with dispatch and receive functionalities.
2026-07-14 10:20:38 +05:30