-
Notifications
You must be signed in to change notification settings - Fork 975
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.
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
ac : added functionality to run payroll button in finance and accounts #1275
Open
sumitttttt
wants to merge
295
commits into
FusionIIIT:ac
Choose a base branch
from
its-me-Navneet:sumit_lab9
base: ac
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…taker (FusionIIIT#1132) Co-authored-by: Akshat Nema <[email protected]>
* Query Optimization * Removed Unnecessary print Statements * Used .exists() method
Co-authored-by: akshatnema <[email protected]>
* secure the purchage and store URL's student will not be able to access now * Revert "secure the purchage and store URL's student will not be able to access now" This reverts commit 22f9329. * Purchase-and-store URL's have been protected
…ues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <[email protected]>
…tructor (FusionIIIT#1075) Co-authored-by: “tech-akash” <“[email protected]”>
Merge main into sa-2
Merge main into ac-5
…ontact number in doctor's schedule (FusionIIIT#1077)
…heir schemas (FusionIIIT#1230) Co-authored-by: Akshat Nema <[email protected]> Fix problem regarding fetching batch for students enrolled in batch 2… (FusionIIIT#1030)
… view feedback option for secincharge (FusionIIIT#1241)
* deleted sheet.xlsx in academic inforamtion * added flexibility in pregistration filter * added time feature for pre registration * corrected allot courses * added dummy data for timetables * Add files via upload * deleted dummy data for time tables * deleted dummy timetable data and restore back to original form * updated add_timetable to add new tt * corrected sem numbers for students for every batch@ * corrected student sem * Update FusionIIIT/applications/academic_procedures/views.py Co-authored-by: Akshat Nema <[email protected]> * Update FusionIIIT/templates/globals/usercard.html Co-authored-by: Akshat Nema <[email protected]> * Update FusionIIIT/templates/globals/usercard.html Co-authored-by: Akshat Nema <[email protected]> --------- Co-authored-by: Akshat Nema <[email protected]>
* responsiveness added * Bill generation completed * some random files * Revert "Bill generation completed" This reverts commit 3d86fda. * changes after first test run * Delete room-availability.html * updated room-availability.html
…ionIIIT#1251) * deleted sheet.xlsx in academic inforamtion * added flexibility in pregistration filter * added time feature for pre registration * corrected allot courses * added dummy data for timetables * Add files via upload * deleted dummy data for time tables * deleted dummy timetable data and restore back to original form * updated add_timetable to add new tt * corrected sem numbers for students for every batch@ * corrected student sem * Update FusionIIIT/applications/academic_procedures/views.py Co-authored-by: Akshat Nema <[email protected]> * Update FusionIIIT/templates/globals/usercard.html Co-authored-by: Akshat Nema <[email protected]> * Update FusionIIIT/templates/globals/usercard.html Co-authored-by: Akshat Nema <[email protected]> * corrected sem number to get currently registered courses --------- Co-authored-by: Akshat Nema <[email protected]>
Co-authored-by: Akshat Nema <[email protected]>
… as faculty (FusionIIIT#1249) Co-authored-by: Akshat Nema <[email protected]>
…#1254) * SA3: Bug fixes and formatting in templates. * tabs: Add different tabs for every tab in gymkhana.
Co-authored-by: Akash Singh <[email protected]>
This reverts commit 8c0d744.
* Update views.py * Update views.py * Update FusionIIIT/applications/academic_procedures/views.py --------- Co-authored-by: Akshat Nema <[email protected]>
* Booking form integrated with Front End * OS-1 week 7 issue resolve * Bill structured properly, updated room availability, meal record fixed, url fixed * Indentaion problems fixed * database changed * More indentations issues resolved * More indentations issues resolved * Next button issue resolved * Database Changed, inventory functionality added * Database conflict resolved * Minor issues resolved * Final changes made * Final Changes made after testing * Final changes after testing * Update FusionIIIT/applications/visitor_hostel/static/visitor_hostel/visitor-hostel.js --------- Co-authored-by: Akshat Nema <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
run payroll button issue has been fixed