nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 14:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,194 Commits 460 Branches 1,744 Tags
cfce719a7d89ef7d1df2fc84d387fa92e68cbdc2
Commit Graph

39194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
82ed96859a Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29913 2022-02-23 17:21:25 +05:30
mergify[bot]
95bf7acff8 test: fix flaky stateful tests (#29749) (#29969) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-Authored-By: Marica <maricadsouza221197@gmail.com>
 2022-02-23 17:07:13 +05:30
marination
34e0b85d6a fix: Check if both old and new items have bundles before merging 
- If only one has bundle against it, they can be merged

(cherry picked from commit a33f04ea41)
 2022-02-23 11:30:04 +00:00
marination
e0ed91433b test: Item Merging with Product Bundles 
(cherry picked from commit 530f9f7029)
 2022-02-23 11:30:04 +00:00
marination
5d1b7ec61d fix: Block merging items if both have product bundles 
(cherry picked from commit 28cc2dbb72)
 2022-02-23 11:30:04 +00:00
mergify[bot]
cdcd60a1ea chore: Rollback after each test, due to premature commit via remove_user_permission (backport #29964) (#29967) 
* chore: Rollback after each test, due to premature commit via `remove_user_permission`

- `remove_user_permission` in `test_warehouse_user` calls delete_doc that enqueues dynamic link deletion
- Execution of background job eventually commits
- While in the test suite it runs sequentially in the same thread and commits whatever was done until then
- Which is why the rollback in `tearDownClass` is quite useless here
- This premature commit causes many illegal transactions caught by `assertRaises` to be committed in the db
- This creates faulty/dirty ledgers and breaks reports, as outiside the test suite this shouldn't/wouldn't happen
- Rollback after each test, and for `test_warehouse_user` in particular, manually cancel transaction

(cherry picked from commit bf8743713d)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py

* test: Make Variant if absent in `test_variant_work_order`, keep test atomic

(cherry picked from commit 5ff3705872)

* fix: Merge conflicts

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-02-23 16:09:37 +05:30
Ankush Menat
37ba3666ac fix: reset stock value if no qty 2022-02-23 14:03:07 +05:30
Ankush Menat
6d354edb6b refactor: code duplication for fallback rates 2022-02-23 14:03:07 +05:30
Ankush Menat
982476d684 chore: batch flag and consumption rate in invariant report 2022-02-23 14:03:07 +05:30
Deepesh Garg
da1713ad00 fix: Remove unintended changes 
(cherry picked from commit a61790c00f)
 2022-02-23 05:52:53 +00:00
Deepesh Garg
e82f55ce9e fix: Validate party account with company 
(cherry picked from commit 5a2b571aa9)
 2022-02-23 05:52:52 +00:00
Deepesh Garg
c040d7df8a Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29740 2022-02-23 11:10:54 +05:30
Deepesh Garg
d1049b0d00 fix: Resolve conflicts 2022-02-23 11:10:07 +05:30
Suraj Shetty
1fbf2b511f Merge pull request #29958 from frappe/mergify/bp/version-13-hotfix/pr-29956 2022-02-23 11:01:38 +05:30
Suraj Shetty
cebe8888af fix: Email translations 
(cherry picked from commit aaa84a21ba)
 2022-02-23 05:31:15 +00:00
Saqib Ansari
1689409438 Merge pull request #29714 from GangaManoj/fetch-valuation-rate 
fix: Fetch valuation rate for stock items consumed during asset repair
 2022-02-23 09:24:27 +05:30
Deepesh Garg
259a091a37 fix: Remove print statements 
(cherry picked from commit a4c6cb9f12)
 2022-02-22 15:14:01 +00:00
Deepesh Garg
247325e4f5 fix: Update bank reconciliation statement 
(cherry picked from commit 0b5e618e3a)
 2022-02-22 15:14:01 +00:00
Deepesh Garg
e998521ca6 fix: Update queries in Bank Reconciliation Tool 
(cherry picked from commit 295cbb0ff2)
 2022-02-22 15:14:00 +00:00
Deepesh Garg
c2129b762a fix: Add patch for account fields 
(cherry picked from commit a0bdcbd0cd)

# Conflicts:
#	erpnext/patches.txt
 2022-02-22 15:13:59 +00:00
Deepesh Garg
93033fb87f feat: Bank Reconciliation for loan documents 
(cherry picked from commit 555b1335f6)
 2022-02-22 15:13:58 +00:00
Deepesh Garg
ee84985dc7 Merge pull request #29947 from frappe/mergify/bp/version-13-hotfix/pr-29942 
fix: Taxjar minor fixes (backport #29942)
 2022-02-22 19:39:39 +05:30
Subin Tom
46ed9a059c fix: Taxjar minor fixes 
(cherry picked from commit 1682a26fe6)
 2022-02-22 14:08:52 +00:00
Saqib Ansari
945a685a34 Merge pull request #29937 from frappe/mergify/bp/version-13-hotfix/pr-29900 
fix(asset): no. of depr booked cannot be equal to total no. of depr (backport #29900)
 2022-02-22 18:45:01 +05:30
Saqib Ansari
f4d987c21e Merge branch 'version-13-hotfix' into fetch-valuation-rate 2022-02-22 18:44:46 +05:30
mergify[bot]
807997c6ec fix: remove customer field value when MR is not customer provided (#29938) (#29941) 
(cherry picked from commit 7f55226a58)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-22 18:20:59 +05:30
Saqib Ansari
b6d42ff571 test: number_of_depr_booked = total_number_of_depr 
(cherry picked from commit 780694f6e2)
 2022-02-22 08:54:16 +00:00
Saqib Ansari
2e6a076f90 fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations 
(cherry picked from commit c5808543c8)
 2022-02-22 08:54:16 +00:00
Saqib Ansari
7157a86ea0 Merge branch 'version-13-hotfix' into fetch-valuation-rate 2022-02-22 14:23:29 +05:30
mergify[bot]
6539d32ca9 fix: Fetch conversion factor even if it already existed in row, on item change (#29917) (#29935) 
* fix: Fetch conversion factor even if it already existed in row, on item change

* fix: Retain manually changed conversion factor

- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases

(cherry picked from commit 235fc127b3)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-02-22 13:01:31 +05:30
mergify[bot]
0f101b5209 fix(Salary Slip): TypeError while clearing any amount field in components (backport #29931) (#29932) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-22 11:56:56 +05:30
mergify[bot]
233a75a438 fix(LMS): program enrollment does not give any feedback (backport #29922) (#29924) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-21 23:10:20 +05:30
mergify[bot]
6b87d38a80 fix: JobCard TimeLog to_date (#29872) (#29919) 
(cherry picked from commit e4c4dc402e)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-02-21 20:17:05 +05:30
Deepesh Garg
a63373ce98 fix: Gross profit for credit notes 
(cherry picked from commit 973f6b1bbd)
 2022-02-21 13:59:15 +00:00
Deepesh Garg
9a0b83027a fix: Remove unused param 
(cherry picked from commit 07bcbc6c7e)
 2022-02-21 13:59:15 +00:00
Deepesh Garg
b0a9ff0b04 fix: Update columns in new format 
(cherry picked from commit 2172ab2d37)
 2022-02-21 13:59:15 +00:00
Deepesh Garg
ab4a96dadd fix: Multiple fixes in Gross Profit report 
(cherry picked from commit da73685f71)
 2022-02-21 13:59:15 +00:00
Saqib Ansari
f107a6f3f2 Merge branch 'version-13-hotfix' into fetch-valuation-rate 2022-02-21 17:56:11 +05:30
Ankush Menat
9adbaaea4a fix: round off increments in numeric item variant 
(cherry picked from commit 00e8565868)
 2022-02-21 17:44:41 +05:30
Deepesh Garg
e4281734fe Merge pull request #29909 from frappe/mergify/bp/version-13-hotfix/pr-29907 
fix: Total Credit amount in TDS Payable monthly report (backport #29907)
 2022-02-21 15:40:41 +05:30
Deepesh Garg
a6fba24ab1 fix: Total Credit amount in TDS Payable monthly report 
(cherry picked from commit a82cf7214e)
 2022-02-21 10:05:23 +00:00
Saqib Ansari
1b0ee018b5 Merge branch 'version-13-hotfix' into fetch-valuation-rate 2022-02-21 15:11:26 +05:30
Deepesh Garg
e70933eea2 Merge pull request #29905 from frappe/mergify/bp/version-13-hotfix/pr-29887 
fix: Ledger entries on LIA for term loans (backport #29887)
 2022-02-21 14:54:05 +05:30
Saqib Ansari
bc28755978 fix: sider 2022-02-21 14:26:21 +05:30
Deepesh Garg
130f039549 fix: Ledger entries on LIA for term loans 
(cherry picked from commit 1aa12fb3f1)
 2022-02-21 08:54:58 +00:00
mergify[bot]
14c5be7c27 chore: Show 'Produced Qty' field in Sales Order Item (#29903) (#29904) 
(cherry picked from commit e952cce17d)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-02-21 14:23:52 +05:30
Saqib Ansari
2aba6c38b3 fix: cannot edit valutaion_rate in asset repair 2022-02-21 14:01:12 +05:30
Saqib Ansari
57d5a027fb fix: remove redundant method 2022-02-21 13:58:01 +05:30
Saqib Ansari
2c84b1dfa6 Merge pull request #29898 from frappe/mergify/bp/version-13-hotfix/pr-29896 
fix(pos): removal of coupon code (backport #29896)
 2022-02-21 11:52:31 +05:30
Saqib Ansari
8d24cb44a8 fix(pos): removal of coupon code 
(cherry picked from commit fa38c291bd)
 2022-02-21 06:19:24 +00:00