Skip to content

master to develop #1251

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

Closed
SherinKR wants to merge 72 commits into from
Closed

master to develop #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
f1234d9
feat: cost center filter
anjusha12 Mar 22, 2025
64f99a8
Updated Batta Claim, Batta Policy, and Work Detail doctypes with fiel…
arathipk Mar 24, 2025
fe00fea
Merge pull request #855 from efeone/dev_anju_mar22
SherinKR Mar 24, 2025
c2da841
Merge pull request #856 from efeone/TASK-2025-00458
SherinKR Mar 24, 2025
264a5b1
feat: Add field reason in Petty Cash Request in dialog and Apply vali…
anjusha12 Mar 25, 2025
1a05d48
feat: Add field Department in voucher Entry
anjusha12 Mar 25, 2025
5921f1e
fix:Fix TypeError & Optimize Date Handling in total_days_calculate
avishna-murali Mar 25, 2025
9ddd404
fix: fixed auto-creation of petty cash request
NehaFathimap Mar 24, 2025
b689041
feat:Create Doctype for Bureau Trip Sheet
arathipk Mar 25, 2025
4f54d97
feat:created Bureau Trip Sheet Doctype
arathipk Mar 25, 2025
4a6b8b6
feat: Make total_amount field read only
anjusha12 Mar 25, 2025
542f30f
Update Bureau Trip Sheet field properties
arathipk Mar 25, 2025
057b905
Merge pull request #858 from efeone/voucher_entry_update
SherinKR Mar 25, 2025
606847a
Merge pull request #859 from efeone/department_in_voucher_entry
SherinKR Mar 25, 2025
15a381f
Merge pull request #860 from efeone/avish_acc.mar22
SherinKR Mar 25, 2025
9b22c5a
Merge pull request #861 from efeone/new_branch_master_o1
SherinKR Mar 25, 2025
1000fd2
Merge pull request #862 from efeone/TASK-2025-00436
SherinKR Mar 25, 2025
d952b23
Merge pull request #863 from efeone/read_only_total_amt
SherinKR Mar 25, 2025
7fb931d
feat:Trigger total_days_calculate on end_date change
avishna-murali Mar 25, 2025
07ff6d4
feat:Added patches to delete a field in Employee doctype
MhmdSinanKT Mar 25, 2025
3c5455a
feat : filter in mode of travel should not affect if user is Administ…
Nidhashirinniyas Mar 25, 2025
41da69c
fix : Removing unwanted file
Nidhashirinniyas Mar 25, 2025
ad6ac2b
Update master.yml
SherinKR Mar 25, 2025
e5f05e1
Merge pull request #864 from efeone/beams_1
SherinKR Mar 25, 2025
44fe13e
Merge pull request #865 from efeone/avish_acc.mar22
SherinKR Mar 25, 2025
b7bd697
Merge pull request #866 from efeone/m1new_01
SherinKR Mar 25, 2025
275ada4
Merge pull request #867 from efeone/beams_2
SherinKR Mar 25, 2025
a66b0f7
feat: Batta Claim Calculation
hridyalakshmi Mar 26, 2025
f84099c
Resolved Conflicts
arathipk Mar 26, 2025
a996528
fix:Reordered fields in Bureau Trip Sheet for better structure.
arathipk Mar 26, 2025
a5809f0
fix: Date Validation
hridyalakshmi Mar 26, 2025
df6cd56
fix: Added documentation
hridyalakshmi Mar 26, 2025
63ab66d
chore:improve code formatting, add comments
arathipk Mar 26, 2025
a5efe1b
Merge pull request #869 from efeone/TASK-2025-00489
SherinKR Mar 26, 2025
9434c78
Merge pull request #870 from efeone/acc64
SherinKR Mar 26, 2025
f05961f
fix:total_hours calculation in Bureau Trip Sheet
arathipk Mar 27, 2025
5be15a4
fix: Update Batta Claim
hridyalakshmi Mar 27, 2025
bf277ff
Merge pull request #872 from efeone/total_hours
SherinKR Mar 27, 2025
023b1c6
Merge pull request #873 from efeone/acc65
SherinKR Mar 27, 2025
b17a24b
fix: Update Batta Calculation
hridyalakshmi Mar 27, 2025
c6e29c3
feat: added option to show budget dimensions
MhmdSinanKT Mar 27, 2025
9dd2989
Merge pull request #876 from efeone/TASK-2025-00497
SherinKR Mar 27, 2025
9fc51be
Merge pull request #875 from efeone/acc66
SherinKR Mar 27, 2025
e06eaf5
fix: convert string to float
hridyalakshmi Mar 27, 2025
1b30546
Merge pull request #877 from efeone/acc68
SherinKR Mar 28, 2025
5184ffc
fix: Update Requested amount in Petty cash request
hridyalakshmi Mar 28, 2025
df63b48
refactor:Bureau Trip Sheet calculation
arathipk Mar 28, 2025
c01c0d0
Merge pull request #878 from efeone/acc69
SherinKR Apr 1, 2025
e98e9b8
fix:Remove duplicates and unnecessary repetitions for efficiency
arathipk Apr 1, 2025
71708d1
fix: Include in IBF
SherinKR Apr 1, 2025
188f889
Merge pull request #883 from efeone/dev_sherin_apr1
SherinKR Apr 1, 2025
8fc42a0
fix: Update Food allowance
hridyalakshmi Apr 3, 2025
ab65314
Merge pull request #880 from efeone/TASK-2025-00504
SherinKR Apr 3, 2025
46e5e0e
Merge pull request #884 from efeone/acc70
SherinKR Apr 3, 2025
4751dc4
Update Revenue Budget and Revenue Template
hridyalakshmi Apr 8, 2025
8c8c860
fix: Added Documentation
hridyalakshmi Apr 8, 2025
ae5c0f0
Merge pull request #893 from efeone/acc71
SherinKR Apr 8, 2025
56c5fd3
fix: Updated daily batta reference in journal entry accounts
hridyalakshmi Apr 25, 2025
3bf2de9
Merge pull request #919 from efeone/acc72
SherinKR Apr 28, 2025
4c8960b
fix: Update travelled distance in food calculation and Daily batta wi…
hridyalakshmi May 2, 2025
13ceaf6
Merge pull request #929 from efeone/acc73
SherinKR May 2, 2025
64fa184
fix:Fix batta calculation timing by increasing setTimeout delay
arathipk May 14, 2025
bbf8f61
Merge pull request #966 from efeone/TASK-2025-00989
SherinKR May 14, 2025
7b1f8e9
fix : In Batta Claim now date can be edited
sappu-hub May 14, 2025
fd1b830
Merge pull request #970 from efeone/acc05
SherinKR May 16, 2025
757121e
Merge pull request #970 from efeone/acc05
SherinKR May 16, 2025
3844b79
Merge remote-tracking branch 'upstream/master' into dev_to_master_jun_12
MhmdSinanKT Jun 12, 2025
d7a01ed
Merge pull request #1037 from efeone/dev_to_master_jun_12
SherinKR Jun 12, 2025
51eb70d
fix: typo error
ajmalroshan123 Jun 17, 2025
17a1684
Merge pull request #1038 from efeone/ajmal-dev-beams
SherinKR Jun 17, 2025
13ff0c4
feat: Create child table Bureau Trip Details
hridyalakshmi Jun 19, 2025
47a800b
Merge pull request #1039 from efeone/acc73
SherinKR Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Deploy to dev
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.DEV_HOST }}
host: ${{ secrets.UAT_HOST }}
username: ${{ secrets.USERNAME }}
key: ${{ secrets.DEV_KEY }}
port: 22
Expand Down
Loading