Skip to content

Dev to master jun 12 #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
SherinKR merged 307 commits into from
Jun 12, 2025
Merged

Dev to master jun 12 #1037

SherinKR merged 307 commits into from
Jun 12, 2025

Conversation

@MhmdSinanKT
Copy link
Contributor

@MhmdSinanKT MhmdSinanKT commented Jun 12, 2025

Reason for PR

  • Merging develop to master

anshidakk and others added 30 commits April 10, 2025 12:21
@anshidakk
fix:remove date validation for required manpower details
b2d95e4
@MhmdSinanKT
Merge pull request #901 from efeone/TASK-2025-00577
b135a58 
 TASK-2025-00577:Restructure Job Applicant custom fields
@MhmdSinanKT
Merge pull request #902 from efeone/saam
51924e1 
fix:remove date validation for required manpower details
@ZakkiyathLulu
fix:Assets are made available only if their docstatus is submitted
d6b08e4
@MhmdSinanKT
Merge pull request #903 from efeone/m1_asset_02
e3ccc30 
Fix:Default asset location fetched only if not given in Project.
@SherinKR
Update develop.yml
28ef64d
@avishna-murali
feat:Add Requested By field to Equipment Request with default set to …
719ed15 
…current user
@NaseeraVP
feat:Customized Full and Final Statement.
0ad9813
@MhmdSinanKT
Merge pull request #904 from efeone/avish_april11
535da2d 
feat:Add Requested By field to Equipment Request with default set to current user
@NaseeraVP
fix:Removed unwanted message in Full and Final Statement.py
e5d5e7a
@NaseeraVP
fix:Added documentation in Full and Final Statement.py
6bc0c83
@NaseeraVP
fix:Changed the snake case in Full and Final Statement.js
fa772f0
@MhmdSinanKT
Merge pull request #905 from efeone/TASK-2025-00282
68d5633 
TASK-2025-00282:Customized Full and Final Statement.
@MhmdSinanKT
feat: get doc api
c048c82
@SherinKR
Merge pull request #907 from efeone/get_doc_api
1df1b34 
feat: get doc api
@anshidakk
feat:update external_resource_request
4e21d06
@anshidakk
fix:update external_resource_request
b4cf459
@anshidakk
feat:create manpower transaction log
e02653c
@anshidakk
fix:update external_resource_request
1f5556a
@MhmdSinanKT
Merge pull request #908 from efeone/newspaper
31e281a 
feat: TASK-2025-00629 update external_resource_request
@ajmalroshan123
feat: changed hired and allocated checkbox to select field
8f7ae4f
@MhmdSinanKT
Merge pull request #910 from efeone/aju_dev_apr17
5f38f02 
feat: changed hired and allocated checkbox to select field
@ajmalroshan123
feat:updated hired vehicle details in project
54d1cea
@ajmalroshan123
feat: Changed the allocated and hired checkbox to status field
11da8ca
@NaseeraVP
feat:Created Vehicle Transaction Log Doctype
f148b9d
@mpmuhammad
Merge pull request #911 from efeone/aju_dev_apr
c7e9d29 
feat:updated hired vehicle details in project
@mpmuhammad
Merge pull request #912 from efeone/TASK-2025-00644
344c710 
feat:Created Vehicle Transaction Log Doctype
@NaseeraVP
feat:Added Naming Rule in Vehicle Log Detail Doctype
51a27fd
@MhmdSinanKT
Merge pull request #913 from efeone/TASK-2025-00644
2ca6383 
feat:Added Naming Rule in Vehicle Log Detail Doctype
@NaseeraVP
fix:Added validation for assigning same employee to same project and …
f6568bf 
…disallowed creation after employee assignment
SherinKR and others added 27 commits May 26, 2025 16:42
@SherinKR
Merge pull request #1007 from efeone/anshi_may26
43a2814 
TASK-2025-01109 : correction in journel entry
@avishna-murali
feat: validation for attachments in travel request and new fields in …
1c31e26 
…jv and vehicle (#1008)
@avishna-murali
feat: total claimed and sanctioned amount in expense summary (#1009)
c5d3d6f
@NaseeraVP
feat: added field for attachment in Vehicle Documents doctype (#1010)
f7fbfdc
@NaseeraVP
fix: set allow on submit for vehicle and driver in vehicle allocation (…
abd10c2 
…#1011)
@NaseeraVP
feat: Added connections in Vehicle doctype (#1012)
39d61f7
@NaseeraVP
feat: Added connections in Trip Sheet and Driver doctypes (#1013)
046e0c2
@anshidakk
feat: created a table to store journal entry details in employee trav…
3af456c 
…el request (#1014)
@avishna-murali
feat: moved qr gen of Assets to on submit (#1015)
f61239d
@NaseeraVP
fix: validate hooks structure of project (#1017)
0865b7c
@anshidakk
feat: added filter for bundle field in ATR (#1016)
70a120e
@avishna-murali
feat: set allow on submit for location field in asset (#1018)
ff6ffaf
@anshidakk
feat: filter item in makeup consumption entry (#1019)
12c3bcc
@NaseeraVP
fix: stock return when ATR status becomes returned (#1022)
d89cf44
@anshidakk
fix: issues in equipment request and project (#1023)
f79c15d
@anshidakk
feat: Issue in equipment transaction log (#1024)
6a4eb7c
@avishna-murali
feat: regenerate asset bundle QR code on every save (#1025)
05e7b3d
@avishna-murali
feat: Validate asset locations in Asset Bundle (#1026)
9d8e418
@anshidakk
feat : Added filter for shelf, row and bin in assets and asset moveme…
ec3c4bc 
…nt (#1027)
@anshidakk
fix: updating acquired quantity in project (#1029)
2363c66
@anshidakk
feat: Customize customer, SQ, PO and PI (#1030)
8f427a1
@anshidakk
fix: create journal entry in draft for vehicle incident record (#1031)
dcf2620
@anshidakk
chore: validation for location in asset transfer request (#1032)
3de9687
@ajmalroshan123
chore: validate offense date within trip date range (#1034)
82d81ef
@NaseeraVP
rafact: removed asset transfer checklist from ATR (#1033)
c3b2639
@SherinKR @MhmdSinanKT
Merge pull request #970 from efeone/acc05
757121e 
Fix Batta Claim date editing problem
@MhmdSinanKT
Merge remote-tracking branch 'upstream/master' into dev_to_master_jun_12
3844b79
@MhmdSinanKT MhmdSinanKT requested a review from SherinKR June 12, 2025 07:36
@SherinKR SherinKR merged commit d7a01ed into master Jun 12, 2025
@SherinKR SherinKR deleted the dev_to_master_jun_12 branch June 12, 2025 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SherinKR SherinKR Awaiting requested review from SherinKR

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@MhmdSinanKT @SherinKR @anshidakk @ZakkiyathLulu @avishna-murali @NaseeraVP @ajmalroshan123 @mpmuhammad @NehaFathimap @arathipk