nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,468 Commits 464 Branches 1,752 Tags
3528d6fbdb2e250bf80bd7a03efb2f6fa80c2646
Commit Graph

40468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Govind S Menokee
efc292a5dd 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.
 2021-10-19 12:49:00 +05:30
mergify[bot]
37088391bb feat: add enabled field in UOM (#27993) (#27996) 
(cherry picked from commit 7717b99edb)

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2021-10-19 10:56:33 +05:30
mergify[bot]
fdd9cc76be fix: flaky Org Chart Test (#27971) (#27989) 
(cherry picked from commit 8eacaddde7)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-18 11:47:22 +05:30
mergify[bot]
f328b226fb fix: flaky Org Chart Test (#27971) (#27988) 
(cherry picked from commit 8eacaddde7)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-18 11:47:12 +05:30
Deepesh Garg
f8348ab681 Merge pull request #27983 from frappe/mergify/bp/version-13-pre-release/pr-27967 
fix: Account number and name incorrectly imported using COA importer (backport #27967)
 2021-10-18 11:04:39 +05:30
Deepesh Garg
9f71863a6a Merge pull request #27982 from frappe/mergify/bp/version-13-hotfix/pr-27967 
fix: Account number and name incorrectly imported using COA importer (backport #27967)
 2021-10-18 11:03:51 +05:30
Deepesh Garg
eecfb25c90 Merge pull request #27981 from frappe/mergify/bp/version-13-pre-release/pr-27934 
fix: TDS round off not working from second transaction (backport #27934)
 2021-10-18 11:03:00 +05:30
Deepesh Garg
c99fe8b57d Merge pull request #27980 from frappe/mergify/bp/version-13-hotfix/pr-27934 
fix: TDS round off not working from second transaction (backport #27934)
 2021-10-18 11:02:33 +05:30
Deepesh Garg
41a0e12954 Merge pull request #27979 from frappe/mergify/bp/version-13-pre-release/pr-27970 
fix (India): Interstate internal transfer invoices not visible in GSTR-1 (backport #27970)
 2021-10-18 11:01:06 +05:30
Deepesh Garg
a883f16f31 Merge pull request #27978 from frappe/mergify/bp/version-13-hotfix/pr-27970 
fix (India): Interstate internal transfer invoices not visible in GSTR-1 (backport #27970)
 2021-10-18 11:00:47 +05:30
Jannat Patel
07a9f16eb5 Merge pull request #27984 from frappe/mergify/bp/version-13-hotfix/pr-27850 2021-10-18 10:35:55 +05:30
Ankush Menat
f0383289d8 Merge pull request #27986 from frappe/mergify/bp/version-13-pre-release/pr-27962 
fix: Retain space inside Serial no string while cleaning serial nos (backport #27962)
 2021-10-18 10:34:31 +05:30
Jannat Patel
46209023ce Merge pull request #27985 from frappe/mergify/bp/version-13-pre-release/pr-27850 2021-10-18 10:32:48 +05:30
marination
e69bd39cdd test: Include serial no with spaces in it in sanitation test 
(cherry picked from commit a9341672cf)
 2021-10-18 04:56:11 +00:00
Marica
0fcb3cd918 fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 8cf188d9c0)
 2021-10-18 04:56:10 +00:00
marination
44ab131792 fix: Retain space inside Serial no string while cleaning serial nos 
(cherry picked from commit 41035b0330)
 2021-10-18 04:56:10 +00:00
pateljannat
b648d77316 fix: exclude inactive employees from auto attendance 
(cherry picked from commit 921b4be348)
 2021-10-18 04:35:18 +00:00
pateljannat
acc5cff7ff fix: exclude inactive employees from auto attendance 
(cherry picked from commit 921b4be348)
 2021-10-18 04:34:53 +00:00
Deepesh Garg
0012f0b2da fix: Account number and name incorrectly import using COA importer 
(cherry picked from commit 17a8649500)
 2021-10-18 03:47:22 +00:00
Deepesh Garg
f2340b360f fix: Account number and name incorrectly import using COA importer 
(cherry picked from commit 17a8649500)
 2021-10-18 03:46:59 +00:00
Deepesh Garg
1796f09c0f fix: TDS round off not working from second transaction 
(cherry picked from commit b7a08535b5)
 2021-10-18 03:24:46 +00:00
Deepesh Garg
64b58b148f fix: TDS round off not working from second transaction 
(cherry picked from commit ca0067212d)
 2021-10-18 03:24:46 +00:00
Deepesh Garg
9b71e02003 fix: TDS round off not working from second transaction 
(cherry picked from commit b7a08535b5)
 2021-10-18 03:24:23 +00:00
Deepesh Garg
50e718f508 fix: TDS round off not working from second transaction 
(cherry picked from commit ca0067212d)
 2021-10-18 03:24:22 +00:00
Deepesh Garg
4415bf9968 fix: Interstate internal transfer invoices not visible in GSTR-1 
(cherry picked from commit d9d42b13ab)
 2021-10-18 03:23:55 +00:00
Deepesh Garg
289650748c fix: Interstate internal transfer invoices not visible in GSTR-1 
(cherry picked from commit d9d42b13ab)
 2021-10-18 03:23:31 +00:00
mergify[bot]
268893d5d0 fix: POS Profile payment methods table (#27956) (#27966) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit f3cf36f613)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
 2021-10-15 14:32:55 +05:30
Marica
7b4a5e7e64 Merge pull request #27965 from frappe/mergify/bp/version-13-hotfix/pr-27962 
fix: Retain space inside Serial no string while cleaning serial nos (backport #27962)
 2021-10-14 20:38:20 +05:30
marination
0d1b04326a test: Include serial no with spaces in it in sanitation test 
(cherry picked from commit a9341672cf)
 2021-10-14 14:48:24 +00:00
Marica
db9f56bee8 fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 8cf188d9c0)
 2021-10-14 14:48:24 +00:00
marination
2e9d08f8b1 fix: Retain space inside Serial no string while cleaning serial nos 
(cherry picked from commit 41035b0330)
 2021-10-14 14:48:24 +00:00
mergify[bot]
02ddd5f2b0 fix: remove bad description (#27963) (#27964) 
(cherry picked from commit 4437eb0c4b)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-14 20:06:07 +05:30
rohitwaghchaure
1b7d94d70d Merge pull request #27961 from rohitwaghchaure/merge-13-hotfix-to-pre-release-for-13-13 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2021-10-14 19:17:22 +05:30
Rohit Waghchaure
952c60b3f5 Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-10-14 18:31:09 +05:30
rohitwaghchaure
8c33103838 Merge pull request #27958 from frappe/mergify/bp/version-13-hotfix/pr-27954 
fix: value_after_depreciation calculation (backport #27954)
 2021-10-14 18:25:57 +05:30
mergify[bot]
a8c966eb25 fix: patch to enable scheduled job for reposting (backport #27957) 
* fix: patch to enable scheduled job for reposting

(cherry picked from commit efc60ec2b5)

# Conflicts:
#	erpnext/patches.txt

* chore: formatting

(cherry picked from commit 3f97413814)

* Update enable_scheduler_job_for_item_reposting.py

(cherry picked from commit 230a5d4b39)

* fix: resolve conflict

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-10-14 17:31:51 +05:30
Saqib
88b1c1c87e fix: value_after_depreciation calculation (#27954) 
(cherry picked from commit 1f70dd6e98)
 2021-10-14 10:53:52 +00:00
Marica
771213c415 Merge pull request #27955 from frappe/mergify/bp/version-13-hotfix/pr-27947 
fix: Improve error message for Serial No mismatch between SI and DN (backport #27947)
 2021-10-14 14:24:54 +05:30
marination
d86f5ec1ba fix: Remove trailing space and line break in translatable string 
(cherry picked from commit 60f35ad8a2)
 2021-10-14 08:19:54 +00:00
marination
a568fc7924 fix: Improve error message for Serial No mismatch between SI and DN 
(cherry picked from commit 646acb6b46)
 2021-10-14 08:19:53 +00:00
mergify[bot]
c040256793 fix: cannot add deductions in internal transfer payment entry (backport #27545) (#27930) 
* fix: cannot add deductions in internal transfer payment entry

(cherry picked from commit 1b7414e948)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py

* fix: Update message string

(cherry picked from commit 3b9514d6e1)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.py

* fix: conflicts

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-14 12:34:03 +05:30
Chillar Anand
29996ee726 fix(hr): Update expense account after company is updated (#27843) (#27919) 
(cherry picked from commit f0c4ea14a9)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-10-14 11:13:00 +05:30
Deepesh Garg
1120506e11 Merge pull request #27941 from frappe/mergify/bp/version-13-hotfix/pr-27783 
fix(Subscription): reorder updation of end date (backport #27783)
 2021-10-13 16:56:07 +05:30
mergify[bot]
e64751e3a2 fix: not authorized to update entries after freezing accounts (backport #27937) 
* 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>
(cherry picked from commit 2bb383b178)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflict

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-13 16:41:21 +05:30
Himanshu
bf47c6836e Update subscription.py 
(cherry picked from commit 44306bd0e5)
 2021-10-13 09:52:21 +00:00
hrwx
e80192e2da fix: create past invoices 
(cherry picked from commit ae657c7e4e)
 2021-10-13 09:52:21 +00:00
Sagar Vora
b2f1b02e34 test: use test_dependencies instead of duplication 
(cherry picked from commit 656015d99d)
 2021-10-13 09:52:20 +00:00
Sagar Vora
ed090f2e3e fix: remove newline 
(cherry picked from commit fc375c5bde)
 2021-10-13 09:52:20 +00:00
hrwx
d796172249 fix: reorder updation of end date 
(cherry picked from commit 0f03b19109)
 2021-10-13 09:52:20 +00:00
Deepesh Garg
ff9f6366ad Merge pull request #27935 from frappe/mergify/bp/version-13-hotfix/pr-27907 
feat: HSN based tax breakup table check in GST Settings  (backport #27907)
 2021-10-13 12:56:00 +05:30