nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,618 Commits 479 Branches 1,764 Tags
57925a1315353ec2c5f2b1d251cbaffa80d38fc4
Commit Graph

260 Commits

Author SHA1 Message Date
Rohit Waghchaure
57925a1315 fix: adjustmen entry for stock reco 
(cherry picked from commit 4e463b7d6d)
 2024-09-30 08:57:50 +00:00
mergify[bot]
77892f4e24 fix: incorrect qty after transaction in SLE (backport #43103) (#43104) 
fix: incorrect qty after transaction in SLE (#43103)

(cherry picked from commit 5ff87edc85)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-07 17:34:22 +05:30
mergify[bot]
c0b5f7c8eb fix: same posting date and time, creation causing incorrect balance qty (backport #42904) (#42919) 
* fix: same posting date and time, creation causing incorrect balance qty (#42904)

fix: same posting date and time, creation causing incorrect balance quantity
(cherry picked from commit 27364b7e6b)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-27 14:33:56 +05:30
mergify[bot]
12d5e247c5 perf: data import for stock entries (backport #42711) (#42903) 
* perf: data import for stock entries (#42711)

(cherry picked from commit 1511280464)

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

* chore: fix conflicts

* chore: fix linters issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-26 13:53:23 +05:30
mergify[bot]
e44daf73fb fix: warning message for negative stock (backport #42683) (#42709) 
* fix: warning message for negative stock (#42683)

(cherry picked from commit deccb007c1)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-12 11:20:44 +05:30
mergify[bot]
3fb6f97f66 fix: slowness in reposting dependent vouchers. (backport #42282) (#42569) 
fix: slowness in reposting dependent vouchers. (#42282)

(cherry picked from commit b17696a8ae)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-01 13:21:37 +05:30
mergify[bot]
0256c64634 fix: builtins.KeyError: ('ABC', 'Store - CP') (backport #42505) (#42508) 
fix: builtins.KeyError: ('ABC', 'Store - CP') (#42505)

(cherry picked from commit 25dac1f18e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-30 14:25:01 +05:30
rohitwaghchaure
21bf7fd1f8 fix: timeout while cancelling LCV (#42030) 
fix: timeout while canelling LCV
 2024-06-25 17:38:03 +05:30
rohitwaghchaure
649c192abe fix: dict can not be used as parameter (#41598) 2024-05-23 15:37:00 +05:30
rohitwaghchaure
9aa054c400 fix: negative stock qty error for stock reconciliation (#41283) 
fix: negative stock qty error for stock reco
 2024-05-02 09:38:33 +05:30
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
Rohit Waghchaure
1df54114a8 chore: fixed test case 2024-03-20 20:20:44 +05:30
Rohit Waghchaure
77349a0af6 chore: fix test case 2024-03-20 20:09:22 +05:30
Rohit Waghchaure
c36a5d1ba3 chore: fix backport issues 2024-03-20 20:09:22 +05:30
rohitwaghchaure
1c7128e77b chore: fix conflicts 2024-03-20 20:09:22 +05:30
Rohit Waghchaure
ce7a53f810 chore: remove microsecond from posting_datetime 
(cherry picked from commit a73ba2c0d2)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
 2024-03-20 20:08:37 +05:30
Rohit Waghchaure
5e68ebd030 perf: new column posting datetime in SLE to optimize stock ledger related queries 
(cherry picked from commit d80ca523a4)
 2024-03-20 20:07:36 +05:30
Rohit Waghchaure
1a26c70df2 fix: incorrect active serial nos due to backdated transactions 2024-01-13 10:10:02 +05:30
rohitwaghchaure
3a668bbe96 fix: reposting not fixing valuation rate for sales return using movin… (#38895) 
fix: reposting not fixing valuation rate for sales return using moving average method
 2023-12-21 14:13:34 +05:30
mergify[bot]
984703c3c9 fix: make adjustment entry using stock reconciliation (backport #37995) (#38008) 
* fix: make adjustment entry using stock reconciliation (#37995)

fix: do adjustment entry using stock reconciliation
(cherry picked from commit a8216b9727)

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

* chore: fix conflicts

* fix: conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-09 13:40:14 +05:30
s-aga-r
9406ddbff0 fix: Stock Reconciliation Insufficient Stock Error (#37494) 
* fix: Stock Reconciliation Insufficient Stock Error

* fix: linter

* test: add test case for Stock Reco Batch Item
 2023-10-14 16:53:29 +05:30
s-aga-r
d2b22db500 fix: use flt to ignore TypeError (#37481) 2023-10-13 10:22:20 +05:30
s-aga-r
26ad688584 fix: negative valuation rate in PR return (#37424) 
* fix: negative valuation rate in PR return

* test: add test case for PR return
 2023-10-11 18:44:32 +05:30
rohitwaghchaure
1480acabb0 feat: validate negative stock for inventory dimension (#37373) 
* feat: validate negative stock for inventory dimension

* test: test case for validate negative stock for inv dimension
 2023-10-06 17:55:32 +05:30
rohitwaghchaure
620b21fec5 fix: timeout error coming during reposting (#36715) 2023-08-18 18:33:04 +05:30
rohitwaghchaure
ee04c6d5c5 fix: allow negative stock condition for batch item (#36586) 
* fix: allow negative stock condition for batch item

* fix: test case
 2023-08-11 13:57:27 +05:30
rohitwaghchaure
2800ad39d2 fix: incorrect available qty for backdated stock reco with batch (#36581) 2023-08-10 17:22:14 +05:30
rohitwaghchaure
c1819a4b21 fix: serial no not able to reject for the internal transfer (#36467) 2023-08-03 12:19:25 +05:30
mergify[bot]
32bdb7cccd fix: only publish repost progress to doc subscriber (backport #36400) (#36402) 
* fix: only publish repost progress to doc subscriber (#36400)

Huge size of string gets blasted to everyone on site. Due to some memory
leak (cause unknown) till sockets are open the strings are also in
process' memory.

related https://github.com/frappe/frappe/issues/21863

(cherry picked from commit c0642cf528)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-07-29 18:14:51 +05:30
Rohit Waghchaure
373b868c1d fix: incorrect Balance Qty in the stock ledger for the item with Serial and Batch no 2023-07-17 21:07:32 +05:30
Rohit Waghchaure
2c21404813 fix: circular dependency during reposting causing timeout error 
(cherry picked from commit c16a5814d4)
 2023-07-11 12:59:55 +00:00
Rohit Waghchaure
c0c693d8b0 fix: reposting has not changed valuation rate 2023-07-01 23:50:27 +05:30
s-aga-r
bdb5cc8ad4 fix: update Stock Reconciliation diff qty while reposting 
(cherry picked from commit 6a1b0a2fab)
 2023-06-15 06:13:10 +00:00
s-aga-r
8b617fb75e fix: Stock Reconciliation document update while reposting 
(cherry picked from commit db159dd11f)
 2023-06-12 13:13:17 +00:00
s-aga-r
cc95cedfee fix: update Stock Reconciliation document while reposting 2023-05-31 16:59:53 +05:30
Rohit Waghchaure
fe1e2fec7a fix: travis 
(cherry picked from commit 718ad3f240)
 2023-05-26 17:18:40 +00:00
Rohit Waghchaure
5a9452f4a3 fix: incorrect available quantity in BIN 
(cherry picked from commit 9e5e2de5d5)
 2023-05-26 17:18:39 +00:00
Sagar Sharma
a8fc17e0ae refactor: use calculate_items_qty_and_amount() to update scr items rate 
(cherry picked from commit 9c72c2a6cb)
 2023-05-15 10:56:51 +00:00
s-aga-r
9a8ee62d5a fix: recalculate costs in SCR while reposting 
(cherry picked from commit a6cb6c6f47)
 2023-05-15 10:56:50 +00:00
Rohit Waghchaure
f5f4902494 fix: internal transfer condition 
(cherry picked from commit b5a2ccf21d)
 2023-05-04 11:32:45 +00:00
Rohit Waghchaure
e33fb3b242 fix: timeout error while submitting delivery note 
(cherry picked from commit 2d5ccc07b1)
 2023-05-01 18:01:02 +00:00
Rohit Waghchaure
c020789bfc fix: incorrect OR condition causing timeout error 
(cherry picked from commit 379b215aea)
 2023-04-24 12:37:50 +00:00
Rohit Waghchaure
aeac43ccf9 fix: duplicate reposting entries of same voucher 
(cherry picked from commit f2253dd645)
 2023-04-22 08:38:53 +00:00
mergify[bot]
3b23fc1eba fix: filtering via batch no (#34951) 
fix: filtering via batch no(#34950)

* fix: filtering via batch no

(cherry picked from commit ea6eeace80)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-20 12:50:40 +05:30
mergify[bot]
7131ff28fd fix: add limit for get_next_stock_reco (#34937) 
fix: limit stock reco issue

(cherry picked from commit fcfa8842a7)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-04-20 10:37:58 +05:30
Rohit Waghchaure
2f356dcc6c fix: stock reco test case 
(cherry picked from commit 6bccd8644e)
 2023-04-17 09:52:59 +00:00
Rohit Waghchaure
c53dc06f80 fix: linters issues 
(cherry picked from commit d9dd64b4d2)
 2023-04-17 07:13:00 +00:00
Rohit Waghchaure
a981b79865 fix: too many writes error while making backdated stock reconciliation 
(cherry picked from commit 7bfc8f1236)
 2023-04-17 07:13:00 +00:00
Rohit Waghchaure
9b90323d53 fix: reposting record not created for backdated stock reco 
(cherry picked from commit 6851b5ba97)
 2023-04-11 09:33:26 +00:00
Rohit Waghchaure
d817c50581 fix: incorrect stock balance quantity for batch item 
(cherry picked from commit ef4bd77196)
 2023-04-05 17:52:45 +00:00