nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 07:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,628 Commits 617 Branches 1,804 Tags
f9e5ac6b607aefe0522b65a4d1879bb239e86c4c
Commit Graph

2187 Commits

Author SHA1 Message Date
mergify[bot]
9657c6431d Merge pull request #52932 from frappe/mergify/bp/version-15-hotfix/pr-52824 
refactor: separate construction of chart related data from `get_columns()` (backport #52824)
 2026-02-25 15:11:46 +05:30
Sudharsanan Ashok
e30b2f1d04 fix(manufacturing): remove delete query of job card & batch and serial no (#52840) 
* fix(manufacturing): remove delete query of batch and serial no

* fix(manufacturing): remove delete query of job card

* fix: remove delete function call for work order

(cherry picked from commit 8b2a971019)
 2026-02-23 11:29:18 +00:00
Pandiyan37
bb1a655efb fix(work_order): update returned qty 
(cherry picked from commit b7f45e6963)
 2026-02-23 10:03:53 +00:00
mergify[bot]
dada7c4aa8 Merge pull request #52873 from frappe/mergify/bp/version-15-hotfix/pr-52871 
fix: use stock qty instead of qty when updating transferred qty in WO (backport #52871)
 2026-02-23 09:43:11 +00:00
Sudharsanan11
76760c2ee3 test(manufacturing): add test to validate the planned qty 
(cherry picked from commit cfbdfcf515)
 2026-02-23 02:01:23 +00:00
Sudharsanan11
b3bcfd5a64 fix(manufacturing): update status for work order before calculating planned qty 
(cherry picked from commit 4d40c84a31)
 2026-02-23 02:01:22 +00:00
Sudharsanan11
33d48c5575 fix(manufacturing): set pick list purpose while creating it from work order 
(cherry picked from commit 23ccc2a8c5)
 2026-02-18 09:45:36 +00:00
Mihir Kandoi
c6682f130c chore: resolve conflicts 2026-02-17 16:07:49 +05:30
Mihir Kandoi
c425944bdf fix: allow sequence id edit in BOM if routing is not set 
(cherry picked from commit 08529964b4)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 2026-02-17 10:35:58 +00:00
Mihir Kandoi
0935b181bf Merge pull request #52721 from aerele/backport-52626 
fix(manufacturing): add sales order fields in subassembly child table (backport #52626)
 2026-02-17 13:42:26 +05:30
Pandiyan37
d2dc0a4c9a test(manufacturing): add test to validate the sales order references for sub assembly items 2026-02-17 12:15:33 +05:30
Mihir Kandoi
e8b46d9815 chore: resolve conflicts 2026-02-17 12:13:33 +05:30
Mihir Kandoi
d6333c1562 fix: do not allow plant floor company and warehouse to be updated 
(cherry picked from commit fd72132743)

# Conflicts:
#	erpnext/manufacturing/doctype/plant_floor/plant_floor.json
 2026-02-17 06:42:15 +00:00
Pandiyan37
53e18a9beb fix(manufacturing): set sales order references in subassembly child table 2026-02-17 12:11:05 +05:30
Pandiyan37
0576752d3b fix(manufacturing): add sales order fields in subassembly child table 2026-02-17 12:10:08 +05:30
Mihir Kandoi
97a6610c0c fix: production plan status 
(cherry picked from commit b3e6b304e4)
 2026-02-17 05:53:54 +00:00
archielister
9efdcf208a fix for obtaining bom_no 
(cherry picked from commit e4df0a393a)
 2026-02-04 14:33:05 +00:00
Sudharsanan11
99f3a7e4cf fix(manufacturing): fix chart period keys 
(cherry picked from commit 27091e5168)
 2026-02-04 11:28:05 +00:00
Sudharsanan11
f965b352c8 fix(manufacturing): handle None value for actual_end_date 
(cherry picked from commit 16f09141da)
 2026-02-04 11:28:05 +00:00
Mihir Kandoi
bd96868736 fix: hide close button on WO if WO is completed 
(cherry picked from commit 6e17ccf499)
 2026-01-30 06:29:12 +00:00
Mihir Kandoi
7b6c7c3e27 fix: production plan not considering planning datetime when creating WO 
(cherry picked from commit 4e19c7e8bd)
 2026-01-29 05:20:41 +00:00
Rohit Waghchaure
14de520ebb fix: UOM of item not fetching in BOM 
(cherry picked from commit ba8eadda52)
 2026-01-25 05:14:50 +00:00
rohitwaghchaure
624ec19305 chore: fix conflicts 
Remove test for reserved serial and batch items and clean up related code.
 2026-01-24 13:42:04 +05:30
Rohit Waghchaure
b5d8477354 fix: Bin reserved qty for production for extra material transfer 
(cherry picked from commit f5378b6573)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
 2026-01-23 15:45:30 +00:00
Mihir Kandoi
8d06ee3966 fix: job cards should not be deleted on close of WO 
(cherry picked from commit c919b1de38)
 2026-01-21 10:17:00 +00:00
Sudharsanan11
4418fb48a9 fix(manufacturing): consider process loss qty while validating the work order 
(cherry picked from commit e6366e830c)
 2026-01-19 16:18:35 +00:00
mergify[bot]
d83365734e Merge pull request #51624 from frappe/mergify/bp/version-15-hotfix/pr-50869 
fix: do cancellation procedures on WO close (backport #50869)
 2026-01-09 09:48:28 +00:00
Mihir Kandoi
7db6ae8bda fix: closed WO becomes open when RM is returned 
(cherry picked from commit d0ba365aaa)
 2026-01-08 08:53:28 +00:00
Sudharsanan11
2645bf648d test(manufacturing): add test to validate planned qty 
(cherry picked from commit 2073cb0106)
 2025-12-23 16:02:09 +00:00
Sudharsanan11
c01f20da00 fix(manufacturing): validate delivered qty in production plan 
(cherry picked from commit eda8a621c6)
 2025-12-23 16:02:09 +00:00
Smit Vora
bb00bb83f8 test: ensure full qty reversal for items outside of BOM on disassemble 
(cherry picked from commit 5b3d2c0d02)
 2025-12-22 06:09:08 +00:00
Smit Vora
16112630ea test: ensure no regression after save and submit on disassemble 
(cherry picked from commit 18ac589796)
 2025-12-22 06:09:07 +00:00
Smit Vora
68eeba41c1 fix: de-duplicate rows on disassembly with multiple manufacture entries 
(cherry picked from commit a091e47bd7)
 2025-12-22 06:09:06 +00:00
Smit Vora
f13db03c9b test: make corrections to tests based on v15 functionality 2025-12-19 10:33:44 +05:30
Smit Vora
0452b22aa6 fix: use original logic for v15 - inverted wrt v16 2025-12-15 17:20:57 +05:30
Smit Vora
edcf24afa9 chore: resolve conflicts 2025-12-15 14:59:06 +05:30
Smit Vora
e403dfe73a test: add test for projected quantity cascading across multiple sales orders 
(cherry picked from commit 92fdec9b92)
 2025-12-15 09:08:47 +00:00
Smit Vora
dffd5d9cdd fix: cascade projected quantity across multiple items in material requests 
(cherry picked from commit d344be32a0)

# Conflicts:
#	erpnext/manufacturing/doctype/production_plan/production_plan.py
 2025-12-15 09:08:47 +00:00
rohitwaghchaure
1693e3ef3f chore: fix conflicts 2025-12-12 11:53:18 +05:30
Sudharsanan11
279cf6fe00 fix(manufacturing): get items for disassembly order 
(cherry picked from commit 99148a2aba)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/work_order.py
 2025-12-12 06:15:12 +00:00
Sudharsanan11
cdc04292f2 fix(manufacturing): add validation for disassemble qty 
(cherry picked from commit 86d6facab3)
 2025-12-12 06:15:11 +00:00
Dany Robert
4ee4a57f72 fix: precision issue on job card submission 
(cherry picked from commit 80730908c9)
 2025-12-10 04:22:20 +00:00
Rohit Waghchaure
cfbd71693b fix: inward same serial / batches in disassembly which were used 
(cherry picked from commit 95e6c72539)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2025-12-08 12:57:58 +00:00
Rohit Waghchaure
176ce0d4d6 fix: variant items not fetched while making BOM for Variant Item 
(cherry picked from commit a0256bd798)
 2025-12-04 04:38:17 +00:00
Mihir Kandoi
b2f6d07c25 fix: untranslated string in job card 
(cherry picked from commit ec06f4a71b)
 2025-12-03 12:40:35 +00:00
Abdeali Chharchhoda
4b49080bc4 fix: correct field name for subcontracted items in material request 2025-11-28 12:33:38 +05:30
Rohit Waghchaure
1d2fccfc0b fix: two primary buttons 
(cherry picked from commit f68515210b)
 2025-11-27 06:27:09 +00:00
Raffael Meyer
cac9eed306 fix(Job Card): avoid Type Error when completed_qty is None (#50447) 2025-11-26 13:16:47 +01:00
mergify[bot]
6cffba9a71 Merge pull request #50713 from frappe/mergify/bp/version-15-hotfix/pr-50712 2025-11-24 07:17:43 +00:00
Pugazhendhi Velu
5b60fbbd30 fix: apply precision for scrap items amount 
(cherry picked from commit 9194e6350a)
 2025-11-24 05:08:42 +00:00