nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,367 Commits 459 Branches 1,746 Tags
87f2dcfb597e45d9a7f970fbe4a644e1e70bca92
Commit Graph

39367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 efc292a5dd)
 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 ebe68c1a7a)
 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
Dany Robert
d734da9337 Merge branch 'develop' into patch-8 2021-10-19 14:14:07 +05:30
Ankush Menat
393749a611 fix: dont recompute item wise taxes from front end 2021-10-19 14:13:34 +05:30
Dany Robert
4c499e804a fix: wrong vat amount 2021-10-19 14:12:59 +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
Dany Robert
1aa34d1780 fix: incorrect VAT Amount in UAT VAT 201 report 2021-10-18 18:46:45 +05:30
Rucha Mahabal
8eacaddde7 fix: flaky Org Chart Test (#27971) 2021-10-18 11:06:16 +05:30
Saqib
ac381d21fe fix: sider 2021-10-18 10:43:15 +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
GangaManoj
0b8cb5dd47 fix: Add missing digit 2021-10-15 04:56:00 +05:30
GangaManoj
fdeb273fa0 fix: Sider issues 2021-10-15 04:53:23 +05:30
GangaManoj
60aae4423d fix: Add missing digit 2021-10-15 04:03:30 +05:30
GangaManoj
371b621364 fix: Compare date strings 2021-10-15 04:02:27 +05:30
GangaManoj
e9d310a13e fix: Format tests 2021-10-15 01:45:53 +05:30
Ganga Manoj
5a0289a810 Merge branch 'develop' into fix-depr-after-sale 2021-10-14 22:37:07 +05:30
GangaManoj
968be70bd1 fix: Remove PR creation from all tests in TestDepreciationBasics 2021-10-14 22:33:35 +05:30
GangaManoj
09215a9781 fix: Remove PR creation from all tests for Depreciation Methods 2021-10-14 22:32:55 +05:30
GangaManoj
4bf01bb4b7 fix: Move Purchase Receipt creation to setUpClass 2021-10-14 22:32:54 +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
Ganga Manoj
8cc81a96fc Merge branch 'develop' into fix-depr-after-sale 2021-10-14 03:12:44 +05:30
GangaManoj
e8986df3ca fix: Move test for Finance Books to Depreciation test suite 2021-10-13 21:36:10 +05:30
GangaManoj
83ec9879ee fix: Add test to validate available_for_use_date 2021-10-13 21:21:50 +05:30