nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 01:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,864 Commits 650 Branches 1,810 Tags
1110dd93ff06cffc0f5e537bb552356aa1dd3bb4
Commit Graph

6203 Commits

Author SHA1 Message Date
mergify[bot]
64f1844bc8 fix: Update Existing Price List Rate not working (backport #40333) (#40526) 
* fix: Update Existing Price List Rate not working (#40333)

(cherry picked from commit 09ea7edb86)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/setup/demo_data/item.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-19 18:11:50 +05:30
ruthra kumar
9d827e84be chore: resolve conflicts 2024-03-16 15:02:23 +05:30
ruthra kumar
f87f284616 test: SO reference validation 
(cherry picked from commit 4f396d3049)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2024-03-16 09:29:07 +00:00
ruthra kumar
5f4a648dd4 refactor: validate SO and SI references 
(cherry picked from commit 4d090bd3b8)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py
 2024-03-16 09:29:07 +00:00
rohitwaghchaure
5a2eaf9092 fix: warehouse issue in pick list (#40453) 2024-03-14 12:17:23 +05:30
rohitwaghchaure
3340463b8e fix: Data too long for column 'stock_queue' (#40450) 2024-03-14 11:39:29 +05:30
Nabin Hait
fa55cc68f8 Merge pull request #40263 from nabinhait/pi-optimization 
perf: Performance optmization for Purchase Invoice submission
 2024-03-13 18:17:41 +05:30
Nabin Hait
d279e23623 fix: added index for price_list column in Item Price 2024-03-13 12:58:13 +05:30
Nabin Hait
6ff9e6ee84 perf: Get bin details only for stock items 2024-03-13 12:57:33 +05:30
mergify[bot]
c6fe409b56 fix: MR Default Supplier search query (backport #40273) (#40350) 
fix: MR Default Supplier search query

(cherry picked from commit c0a1f298a1)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-03-11 11:07:48 +05:30
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
barredterra
911a582941 fix(Shipment Parcel): make length, width and height non-mandatory 
It's tedious to enter all these values and some shipping providers only need to know the weigth and quantity. Companies can alwas cutomize the values to be mandatory, but the reverse is not possible. I'll make sure that the erpnext-shipping app does not break because of this (or fix any problems).

(cherry picked from commit 898c6e30eb)
 2024-03-06 18:26:20 +00:00
mergify[bot]
091d6f330a fix: do not allow to cancel incomplete reposting (backport #40224) (#40229) 
* fix: do not allow to cancel incomplete reposting (#40224)

(cherry picked from commit 72ac56b6c4)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-04 13:14:32 +05:30
Gursheen Anand
e62c49d9a6 fix: provisional reverse entry amount 
(cherry picked from commit 3e59c66806)
 2024-02-29 15:48:36 +00:00
Smit Vora
8c772cfb9f fix: add flags for repost to ensure correct accounting from India Compliance App 2024-02-27 20:33:02 +05:30
Gursheen Anand
a84fc0fe40 test: pr billed amount against debit note 
(cherry picked from commit 6d40844894)
 2024-02-27 10:23:59 +00:00
mergify[bot]
579b27d010 fix: Cannot read properties of undefined (backport #40081) (#40082) 
* fix: Cannot read properties of undefined

(cherry picked from commit 44ed52c5cf)

* chore: fix linter issue

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-24 17:22:37 +05:30
mergify[bot]
865cba406f fix: negative stock error while making stock reconciliation (backport #40016) (#40025) 
* fix: negative stock error while making stock reconciliation (#40016)

fix: negative stock error while making stock reco
(cherry picked from commit da184d709b)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

* chore: fix conflicts

* chore: fix linter issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 11:39:48 +05:30
mergify[bot]
079ba7670c fix: incorrect item name in MR (backport #40018) (#40023) 
fix: incorrect item name in MR (#40018)

(cherry picked from commit 864d7ae04c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 09:50:33 +05:30
mergify[bot]
8e71665e4f fix: 'NoneType' object is not iterable (backport #39977) (#39980) 
fix: 'NoneType' object is not iterable (#39977)

(cherry picked from commit 8e7d47b3a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 15:53:20 +05:30
mergify[bot]
385b08dc50 fix: show active bom in the dropdown while making stock entry and MR (backport #39974) (#39975) 
fix: show active bom in the dropdown while making stock entry and MR (#39974)

(cherry picked from commit 133f8bd92a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 13:13:35 +05:30
mergify[bot]
d0b9c568d3 fix: landed cost voucher not submitting because of incorrect reference (backport #39898) (#39899) 
fix: landed cost voucher not submitting because of incorrect reference (#39898)

(cherry picked from commit 6239fd704b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-14 15:57:48 +05:30
barredterra
8f58b613e4 fix: calculate stock_value_diff 
`d.item_tax_amount` is already in base currency.

(cherry picked from commit 5df5851798)
 2024-02-13 23:52:34 +00:00
mergify[bot]
08e02710cd perf: cached get_last_purchase_details to fix performance issue (backport #39854) (#39855) 
perf: cached get_last_purchase_details to fix performance issue (#39854)

(cherry picked from commit b966c06a4f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-12 15:54:03 +05:30
mergify[bot]
de6e8c74c5 fix(ux): set rate as price list rate on uom change in MR (backport #39816) (#39817) 
* fix: add price list rate field in MR Item

(cherry picked from commit 61a29eb5fb)

# Conflicts:
#	erpnext/stock/doctype/material_request_item/material_request_item.py

* fix: set rate as price list rate on uom change

(cherry picked from commit 5cf0759b0c)

* chore: linter

(cherry picked from commit 1745371cd6)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-11 17:38:37 +05:30
mergify[bot]
2885b8fa44 fix: do not throw validation for canceled SLE (backport #39769) (#39810) 
fix: do not throw validation for cancelled sle

(cherry picked from commit 32ccf3524a)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-08 14:18:50 +05:30
rohitwaghchaure
b10c0c9841 Merge pull request #39731 from frappe/mergify/bp/version-14-hotfix/pr-39626 
perf: memory consumption for the stock balance report (backport #39626)
 2024-02-05 16:02:42 +05:30
rohitwaghchaure
851f1bbdce Merge pull request #39728 from frappe/mergify/bp/version-14-hotfix/pr-39659 
perf: timeout for auto material request through reorder level (backport #39659)
 2024-02-05 14:46:37 +05:30
rohitwaghchaure
e38bb836a5 chore: fix conflicts 2024-02-05 13:20:03 +05:30
rohitwaghchaure
26dfbb7a64 chore: fix conflicts 2024-02-05 12:13:14 +05:30
rohitwaghchaure
b32848d69d perf: memory consumption for the stock balance report (#39626) 
(cherry picked from commit b70f3de16b)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.py
 2024-02-05 06:18:51 +00:00
Rohit Waghchaure
85e6b39e23 perf: timeout for auto material request through reorder level 
(cherry picked from commit 951023f434)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2024-02-05 06:09:53 +00:00
Rohit Waghchaure
4a609d8fa8 fix: incorrect landed cost voucher amount 
(cherry picked from commit d78a1e7814)
 2024-02-05 06:09:35 +00:00
mergify[bot]
4dc5d9a6ca fix: Exchange rate on MR to PO creation for muticurrency POs (#39646) 
fix: Exchange rate on MR to PO creation for muticurrency POs (#39646)

(cherry picked from commit cfd1666181)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-31 12:49:22 +05:30
mergify[bot]
3ee0555115 fix: perf issue while submitting stock entry (backport #39634) (#39641) 
fix: perf issue while submitting stock entry (#39634)

(cherry picked from commit b14886b227)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-30 15:44:03 +05:30
rohitwaghchaure
f6725e4342 fix: do not consider rejected warehouses in pick list (#39539) 
* fix: do not picked rejected materials

* test: test case for pick list without rejected materials
 2024-01-30 11:25:20 +05:30
mergify[bot]
2389b41f51 fix amount not updated when change rate in material request (backport #39606) (#39614) 
fix amount not updated when change rate in material request (#39606)

* fix amount not updated when change rate in material request

* make code consistent

(cherry picked from commit efade9b9ae)

Co-authored-by: Jeffry Suryadharma <41689493+jeffrysurya@users.noreply.github.com>
 2024-01-29 13:36:10 +05:30
mergify[bot]
bf61030dab fix: prevent extra transfer against inter transfer transaction (backport #39213) (#39595) 
* fix: prevent extra transfer against inter transfer transaction (#39213)

* fix: prevent extra transfer against inter transfer transaction

* fix: internal transfer dashboard

(cherry picked from commit 8fdc244e16)

# Conflicts:
#	erpnext/controllers/stock_controller.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-27 23:25:04 +05:30
mergify[bot]
c26f7bbed0 fix: incorrect amount in the material request item (backport #39567) (#39568) 
fix: incorrect amount in the material request item (#39567)

fix: incoorect amount in the material request
(cherry picked from commit 2bdfdeeb9a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-25 17:22:15 +05:30
mergify[bot]
1e32c6207e fix: default enable closing stock balance (backport #39551) (#39553) 
fix: default enable closing stock balance (#39551)

(cherry picked from commit d1fb90edff)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-25 12:51:48 +05:30
rohitwaghchaure
822a5a842b Merge pull request #39548 from rohitwaghchaure/fix-do-not-delete-batch-implicitly 
fix: do not delete batches implicitly
 2024-01-25 12:33:28 +05:30
Rohit Waghchaure
9a5995a3e5 fix: do not delete batches implicitly 2024-01-25 11:58:07 +05:30
Rohit Waghchaure
780c069268 fix: email list for auto reorder material request 
(cherry picked from commit 764f3422a0)
 2024-01-24 07:07:05 +00:00
barredterra
dd3b77ae28 refactor(Batch): use const instead of var 2024-01-23 15:08:49 +01:00
barredterra
c759406ebb fix(Batch): reload doc after splitting 
to show updated qty
 2024-01-23 15:08:33 +01:00
rohitwaghchaure
4d11a9c884 chore: fix conflicts 2024-01-14 10:32:10 +05:30
Rohit Waghchaure
c69a59c3c6 fix: added item group in stock reco 
(cherry picked from commit 116ff8241c)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
 2024-01-14 04:58:27 +00:00
rohitwaghchaure
a7922e1ef1 Merge pull request #39341 from rohitwaghchaure/fixed-recalculate-current-qty-for-serial-nos 
fix: incorrect active serial nos due to backdated transactions
 2024-01-13 12:25:07 +05:30
Rohit Waghchaure
1a26c70df2 fix: incorrect active serial nos due to backdated transactions 2024-01-13 10:10:02 +05:30
rohitwaghchaure
519bed9b0f Merge pull request #39344 from frappe/mergify/bp/version-14-hotfix/pr-39333 
fix: added indexing to improve performance (backport #39333)
 2024-01-12 21:19:37 +05:30