nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 23:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,773 Commits 618 Branches 1,804 Tags
f9af53cd8723e701237e6d75c588cf3ee1fc52b9
Commit Graph

2020 Commits

Author SHA1 Message Date
Mihir Kandoi
1522d76a3b fix: consider process_loss_qty in work order 
(cherry picked from commit 95fda47b6c)
 2025-02-03 06:21:40 +00:00
Rohit Waghchaure
eef2f3c5d4 fix: not able to make manufacturing entry for alternate items 
(cherry picked from commit 1607aa1a44)
 2025-01-31 18:18:37 +00:00
Rohit Waghchaure
d0748b1b67 fix: actual qty showing blank for sub-assembly items 
(cherry picked from commit 5be2e71a35)
 2025-01-31 17:09:00 +00:00
Mihir Kandoi
6c4655dd72 fix: existing logical error 2025-01-28 16:56:05 +05:30
Mihir Kandoi
1be19819fb fix: removed field not present in v15 2025-01-28 10:09:31 +05:30
Mihir Kandoi
b59d253d93 fix: import 2 2025-01-27 22:55:33 +05:30
Mihir Kandoi
d74c498efe fix: import 2025-01-27 22:17:13 +05:30
Mihir Kandoi
57f79a2240 fix: merge conflict 2025-01-27 22:01:13 +05:30
Mihir Kandoi
c102e51eb1 fix: logical error in where condition of qb query 
(cherry picked from commit 47f8a86003)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
 2025-01-27 12:03:40 +00:00
Mihir Kandoi
d6e0c6c969 refactor: added condition which checks for corrective operation setting 
(cherry picked from commit 063a205e5a)
 2025-01-27 12:03:39 +00:00
Mihir Kandoi
5c9ac27478 test: Added test for new feature 
(cherry picked from commit 4fb48b7f22)
 2025-01-27 12:03:39 +00:00
Mihir Kandoi
efc7b9ac56 feat: Add corrective job card operating cost as additional costs in stock entry 
(cherry picked from commit 2bf10f68a8)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
 2025-01-27 12:03:38 +00:00
Rohit Waghchaure
ef15429d98 fix: JobCardTimeLog' object has no attribute 'remaining_time_in_mins' 
(cherry picked from commit 41dda35db7)
 2025-01-23 07:53:24 +00:00
Rohit Waghchaure
46a2b7a07e fix: precision issue causing incorrect status 
(cherry picked from commit 4a7586cc01)
 2025-01-22 14:48:23 +00:00
Dany Robert
53468202de fix: precision on work order total qty (#45341) 
* fix: precision on work order total qty

* chore: linters
 2025-01-21 20:18:26 +05:30
ruthra kumar
f97f7cead4 Merge pull request #45317 from frappe/mergify/bp/version-15-hotfix/pr-45262 
fix: fetching items from blanket order to sales/purchase order (backport #45262)
 2025-01-21 13:55:51 +05:30
mahsem
61303db16d fix: linters 
(cherry picked from commit 3697ba0772)
 2025-01-20 06:42:02 +00:00
mahsem
e4f09ce543 fix: translation fixes 
(cherry picked from commit 1d81a9f933)
 2025-01-20 06:42:02 +00:00
Diptanil Saha
7641627b71 fix: fixed typo in manufacturing settings and field rename (#45238) 
* chore: field rename and patch entry

* chore: patch file rename and description improvement

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 97e3770872)
 2025-01-17 11:56:17 +00:00
Diptanil Saha
7fc19e19be fix: fetching items from blanket order to sales/purchase order (#45262) 
* fix: blanket order with zero item quantity

* fix: item quantity validation

* refactor: resolve linter issue

(cherry picked from commit 98d401bee4)
 2025-01-17 11:24:06 +00:00
Rohit Waghchaure
d3c9092266 fix: Does not allow to create Sub-Asseblies of Sub Assemblies 
(cherry picked from commit 318a945d66)
 2025-01-16 09:28:49 +00:00
rohitwaghchaure
a11c15a6cb Merge pull request #42928 from Axentorllc/Fix-BOM-Scrap 
fix: getting scrap items from sub assemblies by fetching scrap items for parent BOM
 2025-01-16 14:55:54 +05:30
Rohit Waghchaure
d956051e69 fix: status of the serial no for the raw materials 
(cherry picked from commit 9607b16dcf)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.json
 2025-01-15 12:45:05 +00:00
Rohit Waghchaure
f5667f56e4 fix: test case 2025-01-15 16:20:17 +05:30
Mihir Kandoi
4e1d4005d9 test: Added new test to check wip skip 
(cherry picked from commit 6edb454eea)
 2025-01-15 09:37:03 +00:00
Mihir Kandoi
8ba42cfbf0 fix: tests 
(cherry picked from commit 09d26a835f)
 2025-01-15 09:37:03 +00:00
Mihir Kandoi
bb0695a883 fix: Skip WIP Warehouse transfer 
(cherry picked from commit bbb5f8056b)
 2025-01-15 09:37:03 +00:00
mergify[bot]
47c6e5a931 fix: typo in manufacturing settings (backport #45190) (#45193) 
fix: typo in manufacturing settings

(cherry picked from commit a9b761f862)

Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2025-01-13 11:59:27 +05:30
Rohit Waghchaure
122b966a7b fix: timeout error for work order 
(cherry picked from commit b4ceda6f2c)
 2025-01-09 08:18:25 +00:00
Rohit Waghchaure
f7b501b29b fix: Returned Qty in Work Order Consumed Materials report 
(cherry picked from commit 30d68a31e0)
 2025-01-06 10:37:32 +00:00
Mihir Kandoi
642b89782d fix: Alternative Item button dissapearing on Save event 
(cherry picked from commit b8838bd9b9)
 2025-01-06 06:52:16 +00:00
Mihir Kandoi
3194807a41 fix: Alternative Items button in Work Order 
(cherry picked from commit e28382afc1)
 2025-01-06 06:52:16 +00:00
sokumon
6247d5aadb fix(style): set image width in BOM 
(cherry picked from commit b634ba7f54)
 2025-01-02 13:31:21 +00:00
Rohit Waghchaure
b5f6926140 fix: validate components and their qty as per BOM in the stock entry 
(cherry picked from commit b1de82ddad)
 2025-01-02 08:16:03 +00:00
Rohit Waghchaure
00102a15e3 fix: BOM cost update issue 
(cherry picked from commit 28ea3ddd51)
 2025-01-02 04:55:22 +00:00
mergify[bot]
9853bd9ba1 fix: incorrect filter for BOM (backport #44954) (#44956) 
fix: incorrect filter for BOM (#44954)

(cherry picked from commit 9fdeb5f826)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-30 23:38:49 +05:30
ruthra kumar
7b90742409 chore: resolve conflict 2024-12-30 14:50:23 +05:30
Himanshu Shivhare
583182180a refactor: Order Number and Order Date fields to Blanket Order 
(cherry picked from commit 5a284df51d)

# Conflicts:
#	erpnext/manufacturing/doctype/blanket_order/blanket_order.json
 2024-12-30 08:32:49 +00:00
ruthra kumar
f83112520d refactor(test): make manufacturing test idempotent 
(cherry picked from commit f3be246df3)
 2024-12-30 12:02:01 +05:30
mergify[bot]
488d8080c8 fix: strings for translation (backport #44816) (#44927) 
* fix: strings for translation

(cherry picked from commit 3be633f6f1)

# Conflicts:
#	erpnext/accounts/utils.py

* fix: resolved conflict

---------

Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-12-27 11:33:09 +05:30
mergify[bot]
497029f958 fix: incorrect Material Transferred for Manufacturing qty (backport #44823) (#44832) 
* fix: incorrect Material Transferred for Manufacturing qty (#44823)

(cherry picked from commit fe0036e707)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-23 13:38:21 +05:30
rohitwaghchaure
3ac801c884 fix: duplicate Use Multi-Level BOM checkbox (#44757) 2024-12-18 10:41:24 +05:30
KerollesFathy
6a84f0b027 chore: resync version-15-hotfix with feature branch 2024-12-11 13:48:01 +02:00
rohitwaghchaure
44f798c3e1 Merge branch 'version-15' into version-15-hotfix 2024-12-11 16:34:48 +05:30
mergify[bot]
5cd39941ee fix: 'Use Multi-Level BOM' checkbox default value (backport #44618) (#44620) 
fix: 'Use Multi-Level BOM' checkbox default value (#44618)

(cherry picked from commit f5c038cd1b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-10 10:57:20 +05:30
mergify[bot]
971e474640 fix: BOM has not attr required items (backport #44598) (#44600) 
fix: BOM has not attr required items (#44598)

(cherry picked from commit 42d238da14)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 608eaaa482)
 2024-12-08 10:37:46 +00:00
mergify[bot]
608eaaa482 fix: BOM has not attr required items (backport #44598) (#44600) 
fix: BOM has not attr required items (#44598)

(cherry picked from commit 42d238da14)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-08 16:06:41 +05:30
Rohit Waghchaure
11fc560a88 fix: duplicate buttons 2024-12-08 14:44:19 +05:30
rohitwaghchaure
97c91c2217 Merge branch 'version-15' into mergify/bp/version-15/pr-44589 2024-12-07 13:12:59 +05:30
rohitwaghchaure
a204abcaa5 chore: fix conflicts 2024-12-07 13:10:40 +05:30