nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,211 Commits 401 Branches 1,698 Tags
635fd5e8f8ee9274956fbfc7df4631433d36ea64
Commit Graph

38211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
635fd5e8f8 fix: conflicts 2021-12-06 11:33:37 +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
GangaManoj
7921e7ebfd fix: Add test for depreciation on sale of a depreciated Asset 
(cherry picked from commit 7ab3b9dd5a)
 2021-12-03 11:24:11 +00:00
GangaManoj
efe9926bb4 fix: Add depreciation_schedule details in create_asset() 
(cherry picked from commit 249672c35d)
 2021-12-03 11:24:10 +00:00
GangaManoj
9eb37197e0 fix: Remove extra brackets 
(cherry picked from commit 700e78d69b)
 2021-12-03 11:24:08 +00:00
GangaManoj
311f9c8389 fix: Calculate depreciation_amount accurately 
(cherry picked from commit 3c8879e777)
 2021-12-03 11:24:08 +00:00
GangaManoj
04acf5b08c fix: Correct expected_values 
(cherry picked from commit 244d9dee04)
 2021-12-03 11:24:07 +00:00
GangaManoj
9a3a22a08e fix: Calculate depreciation_left accurately 
(cherry picked from commit 164a2ad28d)
 2021-12-03 11:24:06 +00:00
mergify[bot]
09f0e9be86 fix(ksa): qrcode for invoices with special chars (#28716) 2021-12-03 16:37:57 +05:30
mergify[bot]
521318b4ad fix: cannot load company form (#28663) 2021-12-03 15:58:29 +05:30
Deepesh Garg
c02d46862d Merge pull request #28713 from frappe/mergify/bp/version-13-hotfix/pr-28708 
fix: Invoice amount in KSA E Invoice QR Code (backport #28708)
 2021-12-03 15:52:29 +05:30
Deepesh Garg
3b3f764ef2 fix: Invocie amount in KSA E Invoice QR Code 
(cherry picked from commit f2ffddf059)
 2021-12-03 09:55:41 +00:00
Deepesh Garg
b09274bd49 Merge pull request #28641 from frappe/mergify/bp/version-13-hotfix/pr-28302 
fix: Shipping Rule picking up old net_rate (backport #28302)
 2021-12-03 15:20:09 +05:30
mergify[bot]
99dfa91f81 feat: Grant commission on certain items only (#28645) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit e10ab1626c)
 2021-12-03 15:17:45 +05:30
mergify[bot]
2f6b1569f4 fix(Non Profit): fetch memberships for 80G certificate by from date only (#28700) (#28704) 
(cherry picked from commit 0b1808e1ee)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-03 12:08:14 +05:30
mergify[bot]
83418f5110 fix: qrcode image name for invoices with special chars 2021-12-03 11:52:47 +05:30
Deepesh Garg
10c4874306 Merge pull request #28654 from deepeshgarg007/tax_template_mapping 
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice
 2021-12-03 09:40:54 +05:30
Deepesh Garg
313eb70bfa Merge pull request #28600 from frappe/mergify/bp/version-13-hotfix/pr-28592 
fix: do not add gst fields if no indian company (backport #28592)
 2021-12-03 09:37:54 +05:30
Deepesh Garg
a1fa55f41f Merge pull request #28681 from frappe/mergify/bp/version-13-hotfix/pr-28533 
fix: misc minor Product Bundle fixes (backport #28533)
 2021-12-02 19:13:57 +05:30