CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 09:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,943 Commits 421 Branches 1,718 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
9c0f8fe7fd Merge pull request #30009 from frappe/mergify/bp/version-13-hotfix/pr-29928 
fix: Account filter in PSOA (backport #29928)
 2022-02-28 12:57:04 +05:30
Marica
5aa42c736f Merge pull request #29994 from marination/fix-user-unique-cart-hotfix 
fix(e-commerce): Unique Shopping Cart Per Logged In User
 2022-02-28 12:37:39 +05:30
Marica
a531792ea5 Merge branch 'version-13-hotfix' into fix-user-unique-cart-hotfix 2022-02-28 12:13:57 +05:30
Deepesh Garg
c9da4e1059 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29865 2022-02-28 11:43:01 +05:30
Deepesh Garg
e509ce5438 fix: Account filter in PSOA 
(cherry picked from commit 70b960e650)
 2022-02-28 06:12:42 +00:00
Saqib Ansari
f21951fa33 Merge pull request #29992 from frappe/mergify/bp/version-13-hotfix/pr-29991 
fix(pos): minor fixes (backport #29991)
 2022-02-28 11:34:27 +05:30
mergify[bot]
5d69a182f6 fix(ux): make "allow zero valuation rate" readonly if "s_warehouse" is set (#29681) (#30002) 
* chore: make allow zero valuation rate readonly if s_warehouse is set

* fix: setting the checkbox to zero whenever the source warehouse is set

* fix: remove allow_on_submit and refresh trigger

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 77ffcd3aed)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-02-26 12:12:10 +05:30
Sagar Sharma
067ede76ea fix: validate Work Order qty against Production Plan (#29721) 
* fix: validate Work Order qty against Production Plan

* chore: err msg when max_qty is 0

* test: add test for overproduction

* fix: CI
 2022-02-26 11:13:00 +05:30
mergify[bot]
afade046fb fix: org chart connectors not rendered when Employee Naming is set to Full Name (backport #29997) (#29998) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-25 23:07:04 +05:30
Devin Slauenwhite
03945aae37 fix: get cart items for logged in user. 2022-02-25 16:43:21 +05:30
Devin Slauenwhite
78c2a369c4 fix: get cart for logged in user. 2022-02-25 16:43:12 +05:30
Devin Slauenwhite
a067aabb3c test: many users linked to customer shopping cart 2022-02-25 16:43:04 +05:30
Marica
c099833560 Merge pull request #29970 from frappe/mergify/bp/version-13-hotfix/pr-29913 
fix: Block merging items if both have product bundles (backport #29913)
 2022-02-25 16:10:09 +05:30
Saqib Ansari
6bb1dccddd fix: merge conflicts 2022-02-25 15:45:52 +05:30
Saqib Ansari
f2264fa58d fix(pos): coupon code is applied even if ignore pricing rule is check 
(cherry picked from commit 81514516f3)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2022-02-25 10:06:21 +00:00
Saqib Ansari
dcef0de906 fix(pos): mode of payment disappears after save 
(cherry picked from commit 69c34cd7ae)
 2022-02-25 10:06:21 +00:00
Deepesh Garg
5ec6a96882 Merge pull request #29960 from frappe/mergify/bp/version-13-hotfix/pr-29879 
fix: Validate party account with company (backport #29879)
 2022-02-24 00:00:30 +05:30
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
Rohit Waghchaure
f87ba6ac0a Merge branch 'version-13-pre-release' into version-13 v13.21.0 2022-02-21 20:29:03 +05:30