Kalana B. Thilakarathna
49c112d188
triger erpo core workflow
2026-09-17 12:37:04 +05:30
kalana_Thilakarathna
c836b57d54
Merge pull request 'gitea work flow update' ( #63 ) from Dev into production
...
Reviewed-on: #63
2026-09-17 07:06:02 +00:00
Kalana B. Thilakarathna
3a583f80e5
gitea work flow update
2026-09-17 12:28:31 +05:30
ImanThiyanga
83e0335504
Merge pull request 'Dev' ( #62 ) from Dev into production
...
Reviewed-on: #62
2026-09-17 05:58:25 +00:00
ImanThiyanga
513343b62a
Merge pull request 'Revert/ci cd merges' ( #61 ) from revert/ci-cd-merges into Dev
...
Reviewed-on: #61
2026-09-17 05:57:56 +00:00
ImanThiyanga
256e39ccff
Revert "Merge pull request 'Dev' ( #58 ) from Dev into production"
...
This reverts commit 821e96e011 , reversing
changes made to 0ff39e9e58 .
2026-09-17 11:25:33 +05:30
ImanThiyanga
efb37fce7a
Revert "Merge pull request 'Dev' ( #60 ) from Dev into production"
...
This reverts commit 01fc2582b6 , reversing
changes made to 821e96e011 .
2026-09-17 11:25:33 +05:30
ImanThiyanga
01fc2582b6
Merge pull request 'Dev' ( #60 ) from Dev into production
...
Reviewed-on: #60
2026-09-16 18:47:15 +00:00
ImanThiyanga
39a2dc60be
Merge pull request 'Feat/ci cd implementation' ( #59 ) from feat/ci-cd-implementation into Dev
...
CI/CD - ERP Core / Build & Deploy (pull_request) Failing after 13m56s
CI/CD - ERP Core / detect (pull_request) Failing after 14m48s
CI/CD - ERP Core / scripts (pull_request) Failing after 12m24s
CI/CD - ERP Core / e2e-typecheck (pull_request) Failing after 13m15s
CI/CD - ERP Core / frontend (pull_request) Failing after 14m7s
CI/CD - ERP Core / backend (pull_request) Failing after 14m59s
CI/CD - ERP Core / ci-ok (pull_request) Failing after 14m58s
Reviewed-on: #59
2026-09-16 18:30:42 +00:00
ImanThiyanga
3b87a6e421
Merge branch 'Dev' into feat/ci-cd-implementation
CI/CD - ERP Core / detect (pull_request) Waiting to run
CI/CD - ERP Core / backend (pull_request) Blocked by required conditions
CI/CD - ERP Core / frontend (pull_request) Blocked by required conditions
CI/CD - ERP Core / e2e-typecheck (pull_request) Blocked by required conditions
CI/CD - ERP Core / scripts (pull_request) Blocked by required conditions
CI/CD - ERP Core / ci-ok (pull_request) Blocked by required conditions
CI/CD - ERP Core / Build & Deploy (pull_request) Waiting to run
2026-09-16 18:30:22 +00:00
ImanThiyanga
2a7a44cc27
change in to merge
CI/CD - ERP Core / detect (pull_request) Failing after 13m11s
CI/CD - ERP Core / ci-ok (pull_request) Has been cancelled
CI/CD - ERP Core / Build & Deploy (pull_request) Failing after 12m17s
CI/CD - ERP Core / backend (pull_request) Has been cancelled
CI/CD - ERP Core / frontend (pull_request) Has been cancelled
CI/CD - ERP Core / e2e-typecheck (pull_request) Has been cancelled
CI/CD - ERP Core / scripts (pull_request) Has been cancelled
2026-09-16 23:48:07 +05:30
ImanThiyanga
c7cf63e7de
initiating connection fixes
2026-09-16 23:47:47 +05:30
ImanThiyanga
d1044e4728
final fix
2026-09-16 13:53:57 +05:30
ImanThiyanga
821e96e011
Merge pull request 'Dev' ( #58 ) from Dev into production
...
Reviewed-on: #58
2026-09-16 06:37:25 +00:00
ImanThiyanga
d6f973202d
Merge branch 'production' into Dev
CI/CD - ERP Core / Build & Deploy (pull_request) Failing after 10m38s
CI/CD - ERP Core / detect (pull_request) Failing after 11m30s
CI/CD - ERP Core / scripts (pull_request) Failing after 11m31s
CI/CD - ERP Core / e2e-typecheck (pull_request) Failing after 12m23s
CI/CD - ERP Core / frontend (pull_request) Failing after 13m14s
CI/CD - ERP Core / backend (pull_request) Failing after 14m6s
CI/CD - ERP Core / ci-ok (pull_request) Failing after 14m59s
2026-09-16 06:36:19 +00:00
ImanThiyanga
1d5a5cf68e
Merge pull request 'Feat/ci cd implementation' ( #57 ) from feat/ci-cd-implementation into Dev
...
CI/CD - ERP Core / detect (pull_request) Has been cancelled
CI/CD - ERP Core / backend (pull_request) Has been cancelled
CI/CD - ERP Core / frontend (pull_request) Has been cancelled
CI/CD - ERP Core / e2e-typecheck (pull_request) Has been cancelled
CI/CD - ERP Core / scripts (pull_request) Has been cancelled
CI/CD - ERP Core / ci-ok (pull_request) Has been cancelled
CI/CD - ERP Core / Build & Deploy (pull_request) Has been cancelled
Reviewed-on: #57
2026-09-16 06:24:55 +00:00
ImanThiyanga
8e472ac996
initialising for ci-cd pipeline
CI/CD - ERP Core / scripts (pull_request) Failing after 12m21s
CI/CD - ERP Core / e2e-typecheck (pull_request) Failing after 13m13s
CI/CD - ERP Core / frontend (pull_request) Failing after 14m5s
CI/CD - ERP Core / backend (pull_request) Failing after 14m57s
CI/CD - ERP Core / detect (pull_request) Failing after 13m42s
CI/CD - ERP Core / Build & Deploy (pull_request) Failing after 12m47s
CI/CD - ERP Core / ci-ok (pull_request) Failing after 14m58s
2026-09-16 11:53:55 +05:30
ImanThiyanga
666979cf22
initiated ci-cd pipeline for the erp core with fronend changes to detect changes on both front and back
2026-09-16 11:53:17 +05:30
ashan_rusiru
eb36e0acfa
Merge pull request 'Users and employees arrangements' ( #56 ) from users-and-employees-arrangements into Dev
...
Reviewed-on: #56
2026-09-14 05:23:25 +00:00
ashan_rusiru
0ff39e9e58
Merge pull request 'Users and employees arrangements' ( #53 ) from users-and-employees-arrangements into production
...
Reviewed-on: #53
2026-09-13 07:52:34 +00:00
ashan_rusiru
cbb610fc8b
Merge branch 'production' into users-and-employees-arrangements
2026-09-13 07:52:24 +00:00
ashan_rusiru
afa9928dcc
Merge pull request 'bug fixing' ( #55 ) from bug-fixing into Dev
...
Reviewed-on: #55
2026-09-13 07:52:06 +00:00
Sasanka
99aa395fb1
updeted
2026-09-13 08:30:18 +05:30
Sasanka
cb41d503c4
emloyee and user fixings
2026-09-11 10:32:47 +05:30
Sasanka
629f3d1f44
bug fixing
2026-09-09 14:38:53 +05:30
ImanThiyanga
b3b6a25ce8
Merge pull request 'Branch crud' ( #52 ) from branch-crud into Dev
...
Reviewed-on: #52
2026-09-08 07:13:47 +00:00
Sasanka
f664961fce
branch crud and intergration
2026-09-08 12:13:49 +05:30
Sasanka
bebec10eb3
feat: add purchase invoice batch print page and related components
...
- Implemented PurchaseInvoiceBatchPrintPage for printing purchase invoices.
- Created InvoicePrintHeader and InvoicePrintFooter components for invoice layout.
- Added invoice layout presets for different styles (Classic, Compact, Modern).
- Developed PurchaseInvoicePaymentDialog for handling payments against invoices.
- Introduced API mocks for company profile and invoice template configuration.
- Added validation functions for company profile and purchase invoices.
- Defined types for company profile, invoice template configuration, and purchase invoices.
2026-09-01 15:25:32 +05:30
ashan_rusiru
160c687db3
Merge pull request 'notification module' ( #51 ) from feat/notification-module into Dev
...
Reviewed-on: #51
2026-08-21 06:40:40 +00:00
Dhananjaya99
d413ad4064
notification module
2026-08-21 12:05:47 +05:30
ImanThiyanga
9b8c2493ad
Merge pull request 'feat: add production navigation permissions and produced items page' ( #50 ) from fix/production-costing into Dev
...
Reviewed-on: #50
2026-08-21 06:32:26 +00:00
ImanThiyanga
99b669395e
feat: add production navigation permissions and produced items page
...
- Created a new migration to add navigation items and permissions for the production section.
- Implemented the Produced Items page with filtering options for date range, templates, warehouses, and status.
- Integrated API calls to fetch produced items, templates, and warehouses.
- Added UI components for displaying produced items in a table format with relevant details.
2026-08-21 11:57:07 +05:30
Dhananjaya99
4cc6a546c7
add day-end and change item model
2026-08-20 14:10:39 +05:30
ImanThiyanga
8835ba9500
Merge pull request 'Refactor code structure for improved readability and maintainability' ( #49 ) from sales-ui-fixers into Dev
...
Reviewed-on: #49
2026-08-18 06:36:24 +00:00
ImanThiyanga
251b23f4b5
Merge pull request 'feat: enhance stage quantity management for running stock inputs' ( #48 ) from bug-fix-production into Dev
...
Reviewed-on: #48
2026-08-18 06:35:24 +00:00
Dhananjaya99
283a56723f
smal change in general ledger UI
2026-08-18 12:02:26 +05:30
Sasanka
9a38cc1131
Refactor code structure for improved readability and maintainability
2026-08-18 11:54:16 +05:30
Sasanka
1c5b05e315
feat: enhance stage quantity management for running stock inputs
...
- Updated `UpdateStageQuantitiesRequest` to include `reasonCodeId` for lowering planned quantities below consumed amounts.
- Modified `ProductionRunService` to allow adjustments to planned quantities for running stock inputs, enforcing reason code requirements for decreases.
- Enhanced `StageDrawer` and `StageEditorPanel` components to support reason code selection and display available stock.
- Added utility functions for stock management and improved user feedback for stock adjustments.
2026-08-17 14:30:55 +05:30
ImanThiyanga
efa4ad3770
Merge pull request 'Feat/intigrate account service in grn module' ( #47 ) from feat/intigrateAccountServiceInGrnModule into Dev
...
Reviewed-on: #47
2026-08-17 08:47:24 +00:00
Dhananjaya99
6528fc8d9d
intigrate others sales , return and implement day end duntinalities
2026-08-16 23:21:40 +05:30
Dhananjaya99
ae6a87022d
make account service with grn
2026-08-15 15:43:01 +05:30
ImanThiyanga
ee9fa40edf
Merge pull request 'initiated migrations fix in warranty' ( #46 ) from fix/migrations-warrenty into Dev
...
Reviewed-on: #46
2026-08-13 09:42:02 +00:00
Sasanka
b1b0fe4bac
initiated migrations fix in warranty
2026-08-13 14:52:11 +05:30
ImanThiyanga
b4993b202d
Merge pull request 'Dev' ( #45 ) from Dev into production
...
Reviewed-on: #45
2026-08-13 06:52:56 +00:00
ImanThiyanga
8555702a76
Merge branch 'production' into Dev
2026-08-13 06:52:48 +00:00
ImanThiyanga
fd95e92eb1
Merge pull request 'feat: add warranty tracking for items and GRN lines' ( #44 ) from warranty-fileds-and-ui-updates into Dev
...
Reviewed-on: #44
2026-08-13 06:51:10 +00:00
ImanThiyanga
6e008773db
Merge pull request 'feat: add warranty tracking for items and GRN lines' ( #43 ) from warranty-fileds-and-ui-updates into production
...
Reviewed-on: #43
2026-08-13 06:42:51 +00:00
Sasanka
179d5b0803
feat: add warranty tracking for items and GRN lines
...
- Enhanced ItemService to include warranty and warranty period months in item DTOs.
- Implemented validation for warranty periods in ItemService.
- Updated frontend item detail and new item pages to handle warranty selection and input.
- Added warranty number handling in GRN creation and detail pages.
- Introduced new GrnLineWarrantyNumber entity to capture warranty numbers for received items.
- Created Warranty enum and associated allowed months for warranty coverage.
- Updated validation logic for GRN lines to ensure warranty numbers are captured correctly.
2026-08-13 12:01:11 +05:30
ImanThiyanga
342012a321
Merge pull request 'Dev' ( #42 ) from Dev into production
...
Reviewed-on: #42
2026-08-12 19:45:10 +00:00
ImanThiyanga
ee6ac913f1
Merge branch 'production' into Dev
2026-08-12 19:44:58 +00:00