nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,972 Commits 399 Branches 1,700 Tags
5be64c2b7fb6f41ce4db563e046d021e666236fa
Commit Graph

38972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
5be64c2b7f docs: explain make_sl_entries arguments 
(cherry picked from commit eb8495a401)
 2022-03-02 13:30:20 +05:30
Ankush Menat
5ebfb65b42 fix: ignore serial no during landed cost voucher 
(cherry picked from commit efc4b943f8)
 2022-03-02 13:30:20 +05:30
Ankush Menat
cdafed1092 test: fix flaky bin value test 
(cherry picked from commit 5d85b35f41)
 2022-03-02 12:35:26 +05:30
Deepesh Garg
ab69cb7b76 Merge pull request #30014 from frappe/mergify/bp/version-13-hotfix/pr-29978 
fix: Commission not applied while making Sales Order from Quotation (backport #29978)
 2022-03-01 18:19:10 +05:30
Deepesh Garg
69d3678d21 Merge pull request #30025 from deepeshgarg007/payment_entry_exchange_rate 
fix: Exchange rate not getting set in payment entry
 2022-03-01 18:18:42 +05:30
mergify[bot]
28a7c79f3c fix: dont validate empty category (#30038) 
(cherry picked from commit 65bb727030)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-01 17:57:10 +05:30
mergify[bot]
c7539ae416 fix(test): flaky test_point_of_sale (#30035) 
(cherry picked from commit 47fe87a72f)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-01 17:51:40 +05:30
Saqib Ansari
3eee7412c5 Merge pull request #30033 from frappe/mergify/bp/version-13-hotfix/pr-30032 
fix: debit credit difference case with rounding adjustment (backport #30032)
 2022-03-01 15:33:10 +05:30
rohitwaghchaure
1e5b9e747f Merge pull request #30023 from frappe/mergify/bp/version-13-hotfix/pr-30015 
refactor: removed validation to check zero qty (backport #30015)
 2022-03-01 14:44:31 +05:30
Saqib Ansari
d93a41e0d0 fix: debit credit difference case with rounding adjustment 
(cherry picked from commit ad2c64f3ff)
 2022-03-01 08:43:25 +00:00
Deepesh Garg
40c0f79291 Merge pull request #30027 from frappe/mergify/bp/version-13-hotfix/pr-30026 
fix: Deferred revenue booking (backport #30026)
 2022-03-01 13:26:28 +05:30
Ankush Menat
5f4965022f fix: track changes on warehouse 
(cherry picked from commit d22a1d440c)
 2022-03-01 13:11:49 +05:30
Deepesh Garg
5f9b2cc1bf fix: Deferred revenue booking 
(cherry picked from commit 366120ffee)
 2022-03-01 07:12:02 +00:00
Deepesh Garg
86e6bdf2c9 fix: Exchange rate not getting set in payment entry 2022-02-28 21:07:08 +05:30
Deepesh Garg
fb05230d51 Merge pull request #30024 from frappe/mergify/bp/version-13-hotfix/pr-29977 
fix: Total taxes and charges in payment entry for multi-currency payments (backport #29977)
 2022-02-28 19:36:21 +05:30
Ankush Menat
e89d60147e test: remove transaction commits from buying module 
(cherry picked from commit 829c453cb6)
 2022-02-28 19:28:36 +05:30
Deepesh Garg
de978ca3d7 test: Add test case for payment entry taxes 
(cherry picked from commit 19fb7ead9f)
 2022-02-28 13:40:22 +00:00
Deepesh Garg
6ed01fedd4 fix: Total taxes and charges in payment entry for multicurrency payments 
(cherry picked from commit b1a46c80d5)
 2022-02-28 13:40:22 +00:00
Deepesh Garg
ca6f196bad fix: Remove conflicts 2022-02-28 18:15:29 +05:30
Rohit Waghchaure
b98d3da8e3 fix: removed validation to check zero qty 
(cherry picked from commit 39d3f20d9b)
 2022-02-28 12:25:20 +00:00
Ankush Menat
aa684e6f3d fix: dont fetch draft/cancelled BOMs 
(cherry picked from commit 1d1203d5ec)
 2022-02-28 15:15:36 +05:30
Deepesh Garg
ebf70a4b5d test: add correct test case 
(cherry picked from commit 4e9a9f35a6)
 2022-02-28 07:35:04 +00:00
Deepesh Garg
bce4ca9390 fix: Commission not applied while making Sales Order from Quotation 
(cherry picked from commit 0373914704)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 2022-02-28 07:35:04 +00:00
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
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