Nabin Hait
2ef4844a3c
feat: Tax for recurring additional salary ( #27459 )
...
* fix: Logic for tax calculation on recurring additional salary
* fix: Get actual amount always in case of overwritten additional salary even if based on payment days
* feat: Test case added for recurring additional salary
* fix: use query builder to get additional salaries instead of raw SQL
* fix: query formatting and remove trailing spaces
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-10-20 15:50:30 +05:30
Jannat Patel
830fa60acd
Merge pull request #28018 from frappe/mergify/bp/develop/pr-27997
...
fix: Employee filter in YTD and MTD in salary slip (backport #27997 )
2021-10-20 13:09:52 +05:30
Govind S Menokee
4f2cf43db7
YTD and MTD Messed up in Salary Slip
...
The filter for YTD, MTD etc are based on employee name. This seems like an amateur mistake. It should be based on employee id.
(cherry picked from commit efc292a5ddc00e433d75b87d6b3378455bac4438)
2021-10-20 07:11:26 +00:00
Jannat Patel
9a409df8fa
Merge pull request #27728 from itechstro/develop
...
fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation
2021-10-20 12:27:22 +05:30
Jannat Patel
d81f811349
fix: map missing fields in opportunity ( #27904 )
2021-10-20 10:53:39 +05:30
Chillar Anand
73ae504721
fix(healthcare): Add patch for removing healthcare doctypes ( #27995 )
...
* fix(healthcare): Add patch for healthcare doctypes
* fix: Update healthcare patch
* fix: Reload stale doctypes
* fix: Reload doc fix
2021-10-19 18:59:23 +05:30
Deepesh Garg
74b0a819a0
Merge pull request #28003 from frappe/mergify/bp/develop/pr-27867
...
fix: Totals row incorrect value in GL Entry (backport #27867 )
2021-10-19 17:50:01 +05:30
Deepesh Garg
21ba9ac744
fix: Totals row incorrect value in GL Entry ( #27867 )
...
(cherry picked from commit ebe68c1a7a47f5e711cc9fc1d40c07e140b76888)
2021-10-19 09:38:40 +00:00
gavin
9916b87767
ci: Rule Added for using frappe.qb over db.sql* ( #28000 )
...
ERPNext port of https://github.com/frappe/frappe/pull/14481
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: abhishek <as7122000@gmail.com>
2021-10-19 14:20:09 +05:30
Noah Jacob
01bb97bd09
Merge pull request #27990 from noahjacob/maint_schedule_fix
...
fix: changes in schedules gets overwritten on save
2021-10-19 13:36:52 +05:30
Noah Jacob
e08a0992b2
Merge branch 'develop' into maint_schedule_fix
2021-10-19 13:12:45 +05:30
Noah Jacob
af1b9e100e
fix: changes in schedules gets overwritten on save
2021-10-19 12:08:32 +05:30
Himanshu
7717b99edb
feat: add enabled field in UOM ( #27993 )
2021-10-19 10:19:40 +05:30
Rucha Mahabal
8eacaddde7
fix: flaky Org Chart Test ( #27971 )
2021-10-18 11:06:16 +05:30
Deepesh Garg
9c54d6df13
Merge pull request #27967 from deepeshgarg007/account_name_number_error
...
fix: Account number and name incorrectly imported using COA importer
2021-10-18 09:16:09 +05:30
Deepesh Garg
46e80095c6
Merge pull request #27934 from deepeshgarg007/tds_round_off_error
...
fix: TDS round off not working from second transaction
2021-10-18 08:53:37 +05:30
Deepesh Garg
30e6f4dfed
Merge pull request #27970 from deepeshgarg007/gstr_1_interstate_internal_transfer
...
fix (India): Interstate internal transfer invoices not visible in GSTR-1
2021-10-18 08:52:41 +05:30
Deepesh Garg
b7a08535b5
fix: TDS round off not working from second transaction
2021-10-16 20:58:24 +05:30
Deepesh Garg
d9d42b13ab
fix: Interstate internal transfer invoices not visible in GSTR-1
2021-10-16 17:09:37 +05:30
Deepesh Garg
17a8649500
fix: Account number and name incorrectly import using COA importer
2021-10-15 21:19:41 +05:30
Subin Tom
f3cf36f613
fix: POS Profile payment methods table ( #27956 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-10-15 12:39:52 +05:30
Marica
c0e632842a
Merge pull request #27962 from marination/clean-serial-no-logic
...
fix: Retain space inside Serial no string while cleaning serial nos
2021-10-14 20:17:42 +05:30
Ankush Menat
4437eb0c4b
fix: remove bad description ( #27963 )
2021-10-14 20:03:37 +05:30
marination
a9341672cf
test: Include serial no with spaces in it in sanitation test
2021-10-14 19:49:13 +05:30
Marica
8cf188d9c0
fix: Use strip instead of lstrip and rstrip
...
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-10-14 19:21:41 +05:30
marination
41035b0330
fix: Retain space inside Serial no string while cleaning serial nos
2021-10-14 18:31:37 +05:30
Ankush Menat
9c1d828b1b
chore: formatting
2021-10-14 17:18:24 +05:30
rohitwaghchaure
1233725b64
Merge pull request #27957 from rohitwaghchaure/patch-to-enable-scheduler-job
...
fix: patch to enable scheduled job for reposting
2021-10-14 17:14:43 +05:30
rohitwaghchaure
230a5d4b39
Update enable_scheduler_job_for_item_reposting.py
2021-10-14 16:57:54 +05:30
Ankush Menat
3f97413814
chore: formatting
2021-10-14 16:45:27 +05:30
Saqib
1f70dd6e98
fix: value_after_depreciation calculation ( #27954 )
2021-10-14 16:23:12 +05:30
Rohit Waghchaure
efc60ec2b5
fix: patch to enable scheduled job for reposting
2021-10-14 16:03:48 +05:30
Marica
ee25ba07a2
Merge pull request #27947 from marination/si-dn-sn-mismatch
...
fix: Improve error message for Serial No mismatch between SI and DN
2021-10-14 13:49:04 +05:30
Jannat Patel
8de5f1f04d
Merge pull request #27850 from pateljannat/auto-attendance-issue
...
fix: exclude inactive employees from auto attendance
2021-10-14 12:48:22 +05:30
Mohammad Hussain Nagaria
904381295e
chore: Add Try on Frappe Cloud button to README ( #27950 )
2021-10-13 20:07:27 +05:30
marination
60f35ad8a2
fix: Remove trailing space and line break in translatable string
2021-10-13 16:50:10 +05:30
marination
646acb6b46
fix: Improve error message for Serial No mismatch between SI and DN
2021-10-13 16:41:11 +05:30
Noah Jacob
2bb383b178
fix: not authorized to update entries after freezing accounts ( #27937 )
...
* fix: not authorized to update entries after freezing accounts
* fix: Add test case
* fix(patch): patched to requeue failed reposts(check_freezing_date)
* chore: misc fixes
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-10-13 16:20:08 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612
...
fix: Removing unused fields from workspace JSON files
2021-10-13 16:18:20 +05:30
Deepesh Garg
bd310e2816
Merge pull request #27783 from hrwX/subscription_generation_fix_develop
...
fix(Subscription): reorder updation of end date
2021-10-13 15:21:50 +05:30
Deepesh Garg
bd8dda2de4
Merge pull request #27497 from nemesis189/taxjar-nexus-update
...
fix: TaxJar update - added nexus list, making api call only for nexus
2021-10-13 15:08:48 +05:30
Deepesh Garg
bd8cfb2e30
fix: Move product tax category folder to taxjar settings
2021-10-13 13:40:53 +05:30
Jannat Patel
00f7f97dc9
Merge branch 'develop' into auto-attendance-issue
2021-10-13 13:28:25 +05:30
Deepesh Garg
2d19e2d54b
fix: Patch
2021-10-13 13:24:19 +05:30
Deepesh Garg
2b9b158448
Merge pull request #27907 from nemesis189/gst-setts-hsn-wise-tax-breakup
...
feat: HSN based tax breakup table check in GST Settings
2021-10-13 12:07:29 +05:30
Deepesh Garg
ca0067212d
fix: TDS round off not working from second transaction
2021-10-13 12:00:25 +05:30
Deepesh Garg
0b263c5100
Merge pull request #27927 from Anuja-pawar/invoice-sections
...
fix: minor ux fixes in Sales & Purchase Invoice
2021-10-12 23:05:48 +05:30
Deepesh Garg
b990d5b112
Merge pull request #27545 from nextchamp-saqib/pay-received-amt-fix
...
fix: cannot add deductions in internal transfer payment entry
2021-10-12 23:04:04 +05:30
Ankush Menat
06b426e9c3
ci: rule to fail PRs that add a new manual commit ( #27928 )
...
Manual commits are frequent source of bugs, confusions or undefined
behaviour.
All new manual commits should be explcitly ignored with explanation on
why it's added. This will only fail for new additions. Existing ones
need to be cleaned up manually.
2021-10-12 23:01:37 +05:30
Deepesh Garg
3b9514d6e1
fix: Update message string
2021-10-12 21:49:51 +05:30
