nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 23:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,114 Commits 458 Branches 1,746 Tags
ac2d1a9accd7aeaf70d609baea2ae437f29f4e4d
Commit Graph

39114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Subin Tom
7529382c5a fix: Taxjar Nexus list visible only if child table is visible 
(cherry picked from commit 0963fceede)
 2021-12-06 06:14:45 +00:00
Saqib Ansari
635fd5e8f8 fix: conflicts 2021-12-06 11:33:37 +05:30
Rohit Waghchaure
5c1a2aee3a Merge branch 'version-13-pre-release' into version-13 v13.16.0 2021-12-06 00:24:07 +05:30
Rohit Waghchaure
0e8981028e bumped to version 13.16.0 2021-12-06 00:44:06 +05:50
rohitwaghchaure
55c653a7f8 Merge pull request #28737 from rohitwaghchaure/change-log-for-v13-16 
chore: change log for v13.16.0
 2021-12-06 00:20:44 +05:30
Rohit Waghchaure
6398e588ec chore: change log for v13.16.0 2021-12-05 23:56:31 +05:30
mergify[bot]
b6ef93d574 fix(patch): create only component type field instead of running the whole setup (#28734) (#28736) 
(cherry picked from commit 0ef42d1000)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-05 13:05:34 +05:30
mergify[bot]
797b75224e fix(patch): create only component type field instead of running the whole setup (#28734) (#28735) 
(cherry picked from commit 0ef42d1000)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-05 13:03:08 +05:30
Noah Jacob
ddcbea3d0a test: added tests for manufacture stock entry when material_consumption is enabled 
(cherry picked from commit 35346de162)
 2021-12-04 18:51:16 +05:30
Noah Jacob
27c8c361d6 fix: incorrect outgoing rates when material_consumption enabled 
(cherry picked from commit 7f3e6d149a)
 2021-12-04 18:51:16 +05:30
rohitwaghchaure
ad9e45bd54 Merge pull request #28728 from frappe/mergify/bp/version-13-hotfix/pr-28710 
fix: incorrect outgoing rates when material_consumption enabled (backport #28710)
 2021-12-04 12:55:13 +05:30
Noah Jacob
740682ec20 test: added tests for manufacture stock entry when material_consumption is enabled 
(cherry picked from commit 35346de162)
 2021-12-04 07:05:15 +00:00
Noah Jacob
b59f5c2574 fix: incorrect outgoing rates when material_consumption enabled 
(cherry picked from commit 7f3e6d149a)
 2021-12-04 07:05:15 +00:00
Ankush Menat
35a3fbd4ed fix: weird item sorting by idx 
(cherry picked from commit ba5a7ffd60)
 2021-12-03 19:12:13 +05:30
Ankush Menat
c57f639ed8 fix: remove autocommit from item rename 
(cherry picked from commit 5caf411be3)
 2021-12-03 18:57:33 +05:30
Ankush Menat
8e19608d0f fix!: dont allow renaming warehouse primary key 
(cherry picked from commit 72dbc3d6b8)
 2021-12-03 18:57:33 +05:30
Ankush Menat
61eb754862 refactor: simplify the way SLEs are submitted 
(cherry picked from commit cef84c25a7)
 2021-12-03 18:48:22 +05:30
Ankush Menat
a9bf4ad8fa refactor: replace misleading variable name 
(cherry picked from commit 97060c45e9)
 2021-12-03 18:48:22 +05:30
Saqib
2a6d202061 fix: test wdv method for indian region 
(cherry picked from commit 7681600b5e)
 2021-12-03 11:24:46 +00:00
GangaManoj
a424f55943 fix: Test for WDV 
(cherry picked from commit f047c6ffc8)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:45 +00:00
Saqib
b937c55b85 fix: reset temporary flag after use 
(cherry picked from commit a261d08dd8)
 2021-12-03 11:24:43 +00:00
GangaManoj
445f1b2a09 fix: Linters 
(cherry picked from commit 06c505ddc2)
 2021-12-03 11:24:42 +00:00
GangaManoj
f0076ca3f9 fix: Add flag for reverse depreciation entries 
(cherry picked from commit cde0dae987)
 2021-12-03 11:24:42 +00:00
GangaManoj
5146985a66 fix: Replace post_depreciation_entries() with make_depreciation_entry() 
(cherry picked from commit 82bf5e5539)
 2021-12-03 11:24:41 +00:00
GangaManoj
92ebe52432 fix: Only add additional depreciation schedule row on sale if depreciation_amount > 0 
(cherry picked from commit 9e7022830e)
 2021-12-03 11:24:40 +00:00
GangaManoj
595d6c31b5 fix: Add missing digit 
(cherry picked from commit 0b8cb5dd47)
 2021-12-03 11:24:40 +00:00
GangaManoj
c104a2a2f4 fix: Sider issues 
(cherry picked from commit fdeb273fa0)
 2021-12-03 11:24:39 +00:00
GangaManoj
9595f7cc3f fix: Add missing digit 
(cherry picked from commit 60aae4423d)
 2021-12-03 11:24:38 +00:00
GangaManoj
6657a15898 fix: Compare date strings 
(cherry picked from commit 371b621364)
 2021-12-03 11:24:38 +00:00
GangaManoj
db06373fa6 fix: Format tests 
(cherry picked from commit e9d310a13e)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:36 +00:00
GangaManoj
a5b8b4ac41 fix: Remove PR creation from all tests in TestDepreciationBasics 
(cherry picked from commit 968be70bd1)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:34 +00:00
GangaManoj
38ec9c80fc fix: Remove PR creation from all tests for Depreciation Methods 
(cherry picked from commit 09215a9781)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:32 +00:00
GangaManoj
627d9633b2 fix: Move Purchase Receipt creation to setUpClass 
(cherry picked from commit 4bf01bb4b7)
 2021-12-03 11:24:29 +00:00
GangaManoj
511c742fd9 fix: Move test for Finance Books to Depreciation test suite 
(cherry picked from commit e8986df3ca)
 2021-12-03 11:24:29 +00:00
GangaManoj
026d72aff8 fix: Add test to validate available_for_use_date 
(cherry picked from commit 83ec9879ee)
 2021-12-03 11:24:28 +00:00
GangaManoj
0442230d98 fix: Enable cwip accounting 
(cherry picked from commit 749d1b6ee6)
 2021-12-03 11:24:27 +00:00
GangaManoj
e1f4672023 fix: Only validate against JV if it's not a reverse depreciation entry 
(cherry picked from commit 8ea1ad9232)
 2021-12-03 11:24:26 +00:00
GangaManoj
86fcc94b7a fix: Add tests to validate item 
(cherry picked from commit a7ec007dcf)
 2021-12-03 11:24:26 +00:00
GangaManoj
d81f4e625a fix: Add tests to validate Asset values 
(cherry picked from commit d8aaf3d389)
 2021-12-03 11:24:25 +00:00
GangaManoj
3cc8dd2b47 fix: Add tearDownClass() 
(cherry picked from commit 4918e9533b)
 2021-12-03 11:24:24 +00:00
GangaManoj
e28a7f11b7 fix: Replace setUp() with setUpClass() 
(cherry picked from commit ef3f2fcb3a)
 2021-12-03 11:24:24 +00:00
GangaManoj
5972acf0ec fix: Add test for depreciation on return of sold Asset 
(cherry picked from commit 273fccf0dd)
 2021-12-03 11:24:23 +00:00
GangaManoj
53789ae4d6 fix: Adjust depreciation_amount in final row 
(cherry picked from commit adebf2d71b)
 2021-12-03 11:24:22 +00:00
GangaManoj
4735162bdc fix: Unlink Depreciation Entry made on sale if the Asset is returned 
(cherry picked from commit f51bd44929)
 2021-12-03 11:24:21 +00:00
GangaManoj
d189ea8d37 fix: Rename tests 
(cherry picked from commit 62fea8a5aa)
 2021-12-03 11:24:20 +00:00
GangaManoj
ae6bac9fcb fix: Categorize into test suites 
(cherry picked from commit c84c983073)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:18 +00:00
GangaManoj
94c3e0503f fix: Add tests for depreciation 
(cherry picked from commit 40ec2d622b)

# Conflicts:
#	erpnext/assets/doctype/asset/test_asset.py
 2021-12-03 11:24:15 +00:00
GangaManoj
7c114c0bc5 fix: Replace asset.schedules with asset.get('schedules') 
(cherry picked from commit fdd9e6cc3c)
 2021-12-03 11:24:13 +00:00
GangaManoj
46c0e349f6 fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned 
(cherry picked from commit 796ed947ce)
 2021-12-03 11:24:12 +00:00
GangaManoj
91fbe54b8d fix: Reset depreciation schedule on returning asset 
(cherry picked from commit b9fb59da58)
 2021-12-03 11:24:12 +00:00