nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,260 Commits 398 Branches 1,698 Tags
82255293c4eb8a9f586db083d19d63c1ea435fb9
Commit Graph

38260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
82255293c4 fix: Error on Invoice generation 2021-12-08 14:06:34 +05:30
Deepesh Garg
5a6d7706a6 Merge pull request #28777 from deepeshgarg007/auto_tax_fetch_fixes 
fix: Error on creating invoice
 2021-12-07 22:19:52 +05:30
Deepesh Garg
e11515a356 fix: Error on creating invoice 2021-12-07 18:44:05 +05:30
Deepesh Garg
f5ab2f4f8c Merge pull request #28773 from frappe/mergify/bp/version-13-hotfix/pr-28731 
fix: Better Error logging for deferred revenue/expense booking (backport #28731)
 2021-12-07 16:55:20 +05:30
mergify[bot]
28b84ad7d6 fix: ignore mandatory fields while creating WO from SO (#28772) (#28774) 
If fields are made mandatory from customizations the WO creation simply
fails.

(cherry picked from commit 6efbbb1058)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-07 16:49:43 +05:30
Deepesh Garg
dad9a913db fix: Log error before throwing exception 
(cherry picked from commit 3c64e201cc)
 2021-12-07 10:12:59 +00:00
Deepesh Garg
6b8b2946c1 fix: Commit joural entries 
(cherry picked from commit 0ba4fcee2a)
 2021-12-07 10:12:58 +00:00
Deepesh Garg
46e492d594 fix: Better Error logging fordeferred revenue/expense booking 
(cherry picked from commit 67a001d876)
 2021-12-07 10:12:58 +00:00
Saqib
f9742394f3 feat: Make Depreciation Entry posting more flexible 2021-12-06 16:45:15 +05:30
Saqib
ef65774b77 fix: Create Depreciation Schedules for existing Assets accurately (backport #28675) 2021-12-06 16:44:38 +05:30
Saqib Ansari
a9bcc869b9 fix: conflicts 2021-12-06 16:12:18 +05:30
Saqib Ansari
f908dcf510 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into mergify/bp/version-13-hotfix/pr-28675 2021-12-06 16:10:54 +05:30
Saqib Ansari
5b25558135 fix(test): test_depr_entry_posting_with_income_account 2021-12-06 16:07:38 +05:30
GangaManoj
c8541ed8e5 fix: Test Depreciation Entry posting when Depreciation Expense Account is an Income Account 2021-12-06 16:07:29 +05:30
GangaManoj
5763f8405a fix: Test Depreciation Entry posting when Depreciation Expense Account is an Expense Account 2021-12-06 16:07:29 +05:30
GangaManoj
d898e74980 fix: Check root_type of Depreciation Expense Account 2021-12-06 16:07:29 +05:30
GangaManoj
81c88d643a fix: Check all ancestors and not just the root node 2021-12-06 16:07:06 +05:30
GangaManoj
78032dfb35 fix: Only raise an error if Depreciation Expense Account is neither an Income nor an Expense Account 2021-12-06 16:07:06 +05:30
GangaManoj
ce86bcf1eb fix: Make Depreciation Entry posting more flexible 2021-12-06 16:07:06 +05:30
GangaManoj
84952beed4 fix: Filter Depreciation Expense Account by root type 2021-12-06 16:06:27 +05:30
Deepesh Garg
334f22f453 Merge pull request #28744 from frappe/mergify/bp/version-13-hotfix/pr-28656 
fix: Taxjar Nexus list visible only if child table is visible (backport #28656)
 2021-12-06 15:57:14 +05:30
Saqib Ansari
d55daf5910 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into mergify/bp/version-13-hotfix/pr-28675 2021-12-06 15:49:02 +05:30
Saqib
416faf76df fix: Calculate depreciation_amount accurately (backport #27585) 2021-12-06 15:43:48 +05:30
Saqib Ansari
1a2e815e6a fix: asset not copied on creating invoice return 2021-12-06 15:16:25 +05:30
Ankush Menat
90131f5e6e fix: reload sellling settings before patch 2021-12-06 12:12:35 +05:30
Ankush Menat
9a1b4119e9 test: set customer group and territory defaults 
(cherry picked from commit a8375239eb)
 2021-12-06 12:12:35 +05:30
Ankush Menat
e9af26e7b6 fix: patch to remove default item group and territory 
(cherry picked from commit bdf7b8d379)
 2021-12-06 12:12:35 +05:30
Ankush Menat
93ee870bf9 fix: remove bad defaults from selling settings 
"All cusotmer groups" and "All territories" are pointless defaults, not
sure why these are made default. They don't help you track anything.
"All" might as well be `Null`.

Even the filters for customer_group suggest it shouldn't be group then
having the root as default makes no sense.

(cherry picked from commit 105b6d498c)
 2021-12-06 12:12:35 +05:30
Subin Tom
a36c13e2d5 fix: removing db call for variables 
(cherry picked from commit ecc5de6159)
 2021-12-06 06:14:46 +00:00
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
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
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