schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,675 Commits 322 Branches 1,581 Tags
15da04d7de1dda71ced973c61401833affeebf6c
Commit Graph

304 Commits

Author SHA1 Message Date
mergify[bot]
57e6ed4645 fix: set project in GL from the SLE (backport #44879) (#44885) 
fix: set project in GL from the SLE (#44879)

(cherry picked from commit 021d077808)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-24 15:12:32 +05:30
mergify[bot]
d6001e5ef9 fix: stock entry not fetching expired batches (backport #44863) (#44868) 
fix: stock entry not fetching expired batches (#44863)

(cherry picked from commit c9b143b509)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-23 22:31:16 +05:30
mergify[bot]
8092d58d9c fix: do not validate qc for scrap item (backport #44844) (#44853) 
fix: do not validate qc for scrap item (#44844)

(cherry picked from commit a2c2b8b5ad)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-23 19:15:46 +05:30
mergify[bot]
b706a8274f perf: SABB (backport #44764) (#44789) 
perf: SABB (#44764)

(cherry picked from commit 90baa38f64)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-19 13:31:28 +05:30
Ernesto Ruiz
465a26f714 chore: Add translations to QI validations in Update stock_controller.py 
chore: Add translations to QI validations in Update stock_controller.py
(cherry picked from commit 6754f15487)
 2024-11-26 06:07:15 +00:00
mergify[bot]
d61f696f85 feat: inventory dimension for rejected materials (backport #44156) (#44165) 
feat: inventory dimension for rejected materials (#44156)

(cherry picked from commit 9bf16df41e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-15 17:28:41 +05:30
mergify[bot]
ce42d847b3 fix: valuation rate for sales / purchase return for serial / batch nos (backport #43925) (#43942) 
fix: valuation rate for sales / purchase return for serial / batch nos (#43925)

(cherry picked from commit 01bb1612da)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-03 04:20:20 +05:30
mergify[bot]
b2deb89826 fix: conversion factor issue (backport #43645) (#43674) 
fix: conversion factor issue (#43645)

(cherry picked from commit a52756f1d4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-15 16:04:48 +05:30
mergify[bot]
60508a9706 fix: 'NoneType' object has no attribute 'has_serial_no' (backport #43514) (#43574) 
fix: 'NoneType' object has no attribute 'has_serial_no' (#43514)

(cherry picked from commit 6ddda6c949)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-09 09:06:20 +05:30
Rohit Waghchaure
21a01575b6 fix: 'NoneType' object has no attribute 'has_serial_no' 
(cherry picked from commit 28f9fd2507)
 2024-09-30 08:11:20 +00:00
mergify[bot]
7916d6436f fix: auto serial and batch bundle not creating for Asset Capitalization (backport #42231) (#42242) 
fix: auto serial and batch bundle not creating for Asset Capitalization (#42231)

(cherry picked from commit 5f53ad3117)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-09 12:13:19 +05:30
Gursheen Anand
c7c9d33954 test: LCV entries after billing 
(cherry picked from commit 53642e7417)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2024-06-15 15:12:22 +00:00
Gursheen Anand
83ccb32be6 fix: add LCV flag to determine negative expenses 
(cherry picked from commit baa3fee1bf)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
 2024-06-15 15:12:21 +00:00
Rohit Waghchaure
6c57971abc fix: return from accepted and rejected warehouse at a same time not working 
(cherry picked from commit 17731f09ef)
 2024-06-12 10:17:33 +00:00
mergify[bot]
3e4c568ddc fix: valuation rate for serial and batch bundle for current bundle (backport #41850) (#41860) 
fix: valuation rate for serial and batch bundle for current bundle (#41850)

(cherry picked from commit 7249a691b3)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-06-11 18:29:54 +05:30
mergify[bot]
dc0bb220ed fix: multiple issues related to serial and batch bundle (backport #41662) (#41668) 
* fix: multiple issues related to serial and batch bundle (#41662)

(cherry picked from commit ce834f5dba)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-28 21:57:13 +05:30
mergify[bot]
a070ad786d fix: not able to submit landed cost voucher (backport #41481) (#41486) 
fix: not able to submit landed cost voucher (#41481)

(cherry picked from commit 81a9521f04)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-15 18:05:39 +05:30
Nikhil Kothari
ee9822fd42 fix: party and party type label on accounting preview 
(cherry picked from commit f7f3b22786)
 2024-04-29 13:24:48 +00:00
Rohit Waghchaure
4555f8a9a6 feat: allow to do reposting for all transactions (audit) 
(cherry picked from commit aefbe21b46)

# Conflicts:
#	erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 2024-04-26 08:15:11 +00:00
Rohit Waghchaure
5de9b6ac75 fix: do not validate batch qty for LCV 
(cherry picked from commit baf0c83cc5)
 2024-04-12 08:36:12 +00:00
Rohit Waghchaure
4e215c6b7b fix: landed cost voucher for legacy pr with batch 
(cherry picked from commit fa91cda46c)
 2024-04-11 12:12:52 +00:00
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Rohit Waghchaure
3761e74436 fix: do not fetch received items in purchase receipt 
(cherry picked from commit 5bff434902)
 2024-03-27 17:11:25 +00:00
Rohit Waghchaure
9ec24bcc6c fix: use serial/batch fields for subcontracting receipt and in transit stock entry 
(cherry picked from commit 3423334e4f)
 2024-03-24 10:34:52 +00:00
mergify[bot]
61d59b392a fix: serial and batch for internal transfer (backport #40467) (#40477) 
fix: serial and batch for internal transfer (#40467)

* fix: serial and batch for internal transfer

* chore: fix test cases

(cherry picked from commit 59222813af)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-15 18:19:56 +05:30
mergify[bot]
7ca72423b9 fix: use serial/batch field for rejected items (backport #40327) (#40329) 
fix: use serial/batch field for rejected items (#40327)

(cherry picked from commit 01856a6e9d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-07 14:36:59 +05:30
mergify[bot]
4b15c00b11 fix: use serial batch fields for subcontracting receipt (backport #40311) (#40315) 
fix: use serial batch fields for subcontracting receipt (#40311)

(cherry picked from commit cef6291311)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-06 19:59:21 +05:30
mergify[bot]
1860399ccb fix: use serial batch fields for packed items (backport #40140) (#40142) 
fix: use serial batch fields for packed items (#40140)

(cherry picked from commit bc9c480246)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-27 07:57:37 +05:30
mergify[bot]
2ee51d36ff fix: set batch created from bundle to batch field in stock transaction (backport #39966) (#39987) 
fix: set batch created from bundle to batch field in stock transaction (#39966)

* fix: set batch created from bundle to batch field in stock transaction

* fix: validation for serial and batch no

(cherry picked from commit 4b24fcd221)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-21 00:04:01 +05:30
mergify[bot]
acd2e93f8c fix: do not empty serial batch fields (backport #39948) (#39956) 
fix: do not empty serial batch fields (#39948)

(cherry picked from commit a4cbfabe0e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-19 10:45:28 +05:30
mergify[bot]
a2f1a964f1 fix: validate duplicate SBB (backport #39862) (#39866) 
* fix: validate duplicate SBB

(cherry picked from commit 094ecc1f62)

* test: duplicate SBB

(cherry picked from commit 55e66db315)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-13 09:09:03 +05:30
mergify[bot]
c643e70e2f perf: cached get_last_purchase_details to fix performance issue (backport #39854) (#39856) 
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:53:50 +05:30
mergify[bot]
43fce29a04 fix: stock entry for use serial batch fields (backport #39843) (#39844) 
fix: stock entry for use serial batch fields (#39843)

(cherry picked from commit e5824fc3f1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-11 11:28:48 +05:30
Rohit Waghchaure
73618f0605 test: test case to check use serial / batch fields feature 
(cherry picked from commit 01650120d4)
 2024-02-06 10:18:06 +00:00
Rohit Waghchaure
a08b97e886 test: fixed test cases 
(cherry picked from commit c1e869f040)
 2024-02-06 10:18:05 +00:00
Rohit Waghchaure
282c19e7e1 fix: use old serial / batch fields to make serial batch bundle 
(cherry picked from commit 9fafc83632)
 2024-02-06 10:18:05 +00:00
mergify[bot]
6d4ca6a1ee fix: prevent extra transfer against inter transfer transaction (backport #39213) (#39596) 
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)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-27 23:25:13 +05:30
s-aga-r
ca18853785 fix: SBB Total Qty validation for SE 
(cherry picked from commit c20241fcb5)
 2024-01-12 15:30:36 +00:00
mergify[bot]
8990c48e7b fix: serial and batch bundle return not working (backport #38754) (#38806) 
fix: serial and batch bundle return not working (#38754)

* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no

(cherry picked from commit 0743289925)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-17 18:02:31 +05:30
Deepesh Garg
d51237195a fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#38123) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* test: Update tests
 2023-11-16 13:38:10 +05:30
Rohit Waghchaure
b96be67a1f fix: remove voucher type and no for Item and Warehouse based reposting 
(cherry picked from commit 0104897d69)
 2023-11-02 07:57:52 +00:00
mergify[bot]
31557902b8 fix: remove from or target warehouse for non internal transfer entries (backport #37612) (#37627) 
fix: remove from or target warehouse for non internal transfer entries (#37612)

(cherry picked from commit 5136fe196b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-23 12:27:16 +05:30
Smit Vora
844e6f47df fix: add regional support to extend purchase gl entries 2023-10-20 17:28:42 +05:30
s-aga-r
3fdcd33b92 feat: Quality Inspection in Subcontracting Receipt 2023-08-23 12:15:35 +05:30
ruthra kumar
46ea814400 chore: cancel gain/loss je while posting reverse gl 2023-07-28 08:34:36 +05:30
Deepesh Garg
ce9164ec69 fix: Validate for missing expense account (#36078) 
* fix: Validate for missing expense account

* fix: Validate for missing expense account
 2023-07-11 12:03:38 +05:30
Deepesh Garg
d9e7bc545e fix: Do full rollback 2023-06-22 16:07:32 +05:30
Deepesh Garg
0e68da5a2a feat: Show stock ledger preview 2023-06-22 15:43:32 +05:30
Deepesh Garg
e7d2bcf108 Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview 2023-06-21 17:16:46 +05:30
Deepesh Garg
011ac131cf fix: Add column values 2023-06-12 18:42:49 +05:30