1892 Commits

Author SHA1 Message Date
rohitwaghchaure
c50639334f chore: fix linter issue
(cherry picked from commit 230a7d8d537500c0f401f21c742f2a2ad653062a)
2024-02-15 09:33:40 +00:00
Rohit Waghchaure
518b22bffc fix: party item code in Blanket Order
(cherry picked from commit 1a8f7f94036e1703ab51f8f591d88688ad2c9f52)
2024-02-15 09:33:39 +00:00
mergify[bot]
88a7248888
fix: production plan issue with sales order (backport #39901) (#39904)
fix:  production plan issue with sales order (#39901)

(cherry picked from commit d0df5df4a609a04d98ee97c9e56931672143587d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-14 16:58:28 +05:30
mergify[bot]
10f17dfcc8
perf: production plan submission (backport #39846) (#39860)
perf: production plan submission

(cherry picked from commit aa1c69dd7aa7731b699853bafcfc40d19d5ab70a)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-02-12 18:17:36 +05:30
mergify[bot]
2d5f186812
feat: get RM costs from consumption entry in manufacture SE (backport #39822) (#39847)
feat: get RM costs from consumption entry in manufacture SE (#39822)

(cherry picked from commit 39067c761427e49c3c5aff5895faaee20de3f672)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-02-11 17:29:21 +05:30
mergify[bot]
60e04ab661
fix: incorrect planned qty in PP (backport #39785) (#39793)
fix: incorrect planned qty in PP

(cherry picked from commit a8ebc94a366e8f15e9bbeab3da064cf5f22dd1b9)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-02-08 09:13:38 +05:30
mergify[bot]
22138867f5
fix: set rate for PO created against BO (backport #39765) (#39767)
* fix: set rate for PO created against BO

(cherry picked from commit 0e5b4e5f07d15fe04855f1c836c5412d3644035a)

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

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-02-07 10:48:58 +05:30
Rohit Waghchaure
3bef12cb55 feat: make material request for job card from workstation dashboard
(cherry picked from commit 6fea9d6dfe50513614e39a7b83ad4db59970e26e)
2024-02-05 13:50:45 +00:00
Rohit Waghchaure
75bd1e6b65 feat: visual plant floor
(cherry picked from commit 68c997aa067f342f6e432e9f9c84416a0a4cc1bf)
2024-02-05 13:50:44 +00:00
mergify[bot]
3eac436e7b
fix: production plan date filters for orders (backport #39702) (#39720)
fix: production plan date filters for orders (#39702)

(cherry picked from commit 407045a1dee4d5d1e4f08f0e78871942ded9e709)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
2024-02-05 10:14:42 +05:30
mergify[bot]
5fe40ac085
fix(work order): resolve type error during job card creation (backport #39713) (#39714)
fix(work order): resolve type error during job card creation (#39713)

fix: type error
(cherry picked from commit c81d597ca510706cf3ca7230f21b1630e7515bf5)

Co-authored-by: Vishnu  VS <Vishnuviswambaran2002@gmail.com>
2024-02-04 22:59:17 +05:30
mergify[bot]
53c705506b
fix: not able to save BOM (duplicate key error) (backport #39620) (#39623)
fix: not able to save BOM (duplicate key error) (#39620)

(cherry picked from commit 4e182b89ce66db9bfb97c332c0132c12e6a83b57)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-29 21:22:34 +05:30
mergify[bot]
ed06f0cd1b
refactor: BOM creator item selector with short description (backport #39433) (#39435)
refactor: BOM creator item selector with short description

(cherry picked from commit 0f881bc90a7a02dd66e167159266aa4386b8dcec)

Co-authored-by: Florian HENRY <florian.henry@open-concept.pro>
2024-01-27 09:51:14 +05:30
Rohit Waghchaure
b0e872aad4 test: fixed test
(cherry picked from commit 63ffce58cce6c68c210572287024da9ca414aca9)
2024-01-21 16:53:46 +00:00
mergify[bot]
d882305c72
fix: performance issue related to stock entry (backport #39301) (#39303)
fix: performance issue related to stock entry (#39301)

(cherry picked from commit c67b0a3a6408075785211da20603fbcd829825bb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-10 22:18:16 +05:30
mergify[bot]
fe973a4b53
fix: set parent doctype on chart (backport #39286) (#39288)
fix: set parent doctype on chart (#39286)

(cherry picked from commit 38c5ecf007751b0e3b152ee5089e7a8e00f17f41)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-10 12:27:16 +05:30
mergify[bot]
0898ea5d92
fix: BOM replace tool does not update exploded items of root (backport #39244) (#39250)
fix: BOM replace tool does not update exploded items of root (#39244)

(cherry picked from commit 5e0d017497ef7afaaa70abffbd3d3924f9e56063)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-09 15:59:12 +05:30
mergify[bot]
abc99f84e9
fix: FG Item incorrect qty in the work order (backport #39200) (#39211)
fix: FG Item incorrect qty in the work order (#39200)

(cherry picked from commit 466625213b6355b53b7af3ee1682cee6fc8649a4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-08 18:18:32 +05:30
mergify[bot]
57bcf9f568
perf: index item_code in bom explosion item (backport #39085) (#39088)
perf: index item_code in bom explosion item (#39085)

(cherry picked from commit 739434b72779fe12aed86a0a61d352948c81b680)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-02 14:43:10 +05:30
mergify[bot]
2e0abbd274
fix: on cancellation of document cancel the serial and batch bundle (backport #39076) (#39082)
fix: on cancellation of document cancel the serial and batch bundle (#39076)

(cherry picked from commit 6e5484ea031027de4e6a897b02bd0f2e7b8adda9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-02 13:28:43 +05:30
mergify[bot]
8ad7fafe2a
fix(DX): capture tracebacks with context (backport #39060) (#39063)
fix(DX): capture tracebacks with context (#39060)

(cherry picked from commit 510fdf7bf651788e549184c23d89c2387c1c2f10)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-01 13:12:07 +05:30
mergify[bot]
3a7506ecbc
fix: work order with multi level, fetch operting cost from sub-assembly (backport #38992) (#39028)
fix: work order with multi level, fetch operting cost from sub-assembly (#38992)

(cherry picked from commit 70abedc57ad2147719c23537ab9aaf348d6e9182)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-29 20:54:26 +05:30
mergify[bot]
3caabf23a5
fix : correct logic for overlap error (backport #38967) (#38968)
fix : correct logic for overlap error (#38967)

fixing overlap error logic with taking care of sequential time job cards in overlap job card list

(cherry picked from commit fe77b9d633dcd168bef6f7c106ec1bd6d1a6591c)

Co-authored-by: VihangT <151990347+VihangT@users.noreply.github.com>
2023-12-27 20:40:03 +05:30
mergify[bot]
ab9fce333d
fix: min order qty optional in production plan (backport #38956) (#38958)
fix: min order qty optional in production plan (#38956)

* fix: min order qty optional in production plan

* fix: test cases

(cherry picked from commit b09c9354fb621c4283d6ebde91f3d061ea88f7f6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-26 21:55:23 +05:30
mergify[bot]
74606dc927
fix: allow to set rate manually for service item in BOM (backport #38880) (backport #38882) (#38885)
fix: allow to set rate manually for service item in BOM (backport #38880) (#38882)

fix: allow to set rate manually for service item in BOM (#38880)

(cherry picked from commit c2f692a4e4f3dd5089fe4949c6cd74574282fdb1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit a6ab53236e08cb57fc8a45496ee4c9ccfbc53e10)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-21 10:44:20 +05:30
mergify[bot]
e3be9c1da4
fix: local reference error in BOM (backport #38850) (#38877)
fix: local reference error in BOM (#38850)

fix: local reference error
(cherry picked from commit ae353398d96746e9e89640b586d1bbd6afbbce77)

Co-authored-by: NIYAZ RAZAK <76736615+niyazrazak@users.noreply.github.com>
2023-12-20 16:34:27 +05:30
mergify[bot]
cbbc6af128
fix: on closed unreserved the production plan qty (backport #38848) (backport #38859) (#38862)
fix: on closed unreserved the production plan qty (backport #38848) (#38859)

fix: on closed unreserved the production plan qty (#38848)

(cherry picked from commit 2184e8ef58379f53ef8f1d069afa26e64796b073)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 5e68b7e3a6cea0001ad1275300a019c0db9e8e13)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 18:18:40 +05:30
mergify[bot]
145ed3a3b1
fix: incorrect material request quantity in Production Plan (backport #38566) (#38579)
fix: incorrect material request quantity in Production Plan (#38566)

(cherry picked from commit aaa9036eca4c5d50fb82a346e08d841e1735fc72)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-05 14:24:26 +05:30
mergify[bot]
2a9e843610
fix: better overlap logic for job card (backport #38432) (#38522)
fix: better overlap logic for job card (#38432)

(cherry picked from commit 74eab910427ca4af94119b0c099e7743be770006)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-03 09:49:48 +05:30
mergify[bot]
8e57862a1c
fix: show item name as title instead of item group in BOM (backport #38478) (#38481)
fix: show item name as title instead of item group in BOM (#38478)

Item fields in BOM used to show Item Group when Items were set to show title as link fields. Now they show Item Name instead

(cherry picked from commit 3a66aefd2c6aedc1b7b6017c174261c1ed4c2907)

Co-authored-by: Gughan Ravikumar <gughanrk@gmail.com>
2023-12-01 11:32:28 +05:30
mergify[bot]
5e6a4d257e
feat: enable automatic type annotations (backport #38452) (#38454)
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f6618f52c7e6194f7abd345cf920b15)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-11-30 14:43:16 +05:30
mergify[bot]
a6f3a103db
chore: fix flaky test case (backport #38369) (#38373)
chore: fix flaky test case (#38369)

(cherry picked from commit ad3634be7c2607ab5c9c831ae01e5ddff7c9ba8b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-28 08:36:06 +05:30
mergify[bot]
d6fe7eb10c
fix: job card overlap validation (backport #38345) (#38348)
fix: job card overlap validation (#38345)

(cherry picked from commit d8245cef723575eaf52c2e39d25a6f9c83ce9ba0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-26 16:28:51 +05:30
mergify[bot]
ed9cd7c92b
fix: bom creator not able to amend / duplicate (backport #38128) (#38129)
fix: bom creator not able to amend / duplicate  (#38128)

fix: bom creator not able to amend
(cherry picked from commit 2df767f596417143ae3b855b2252585bf2bc96f9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-16 18:53:08 +05:30
mergify[bot]
77b1eedcf4
chore: refetch item images on transaction save (backport #38095) (#38099)
chore: refetch item images on transaction save (#38095)

chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5d45a3bf0136ca3fc24a828b008aeee)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-11-14 20:11:19 +05:30
mergify[bot]
6d325a40a1
fix: indentation issue in the Production Plan Summary report (backport #38019) (#38069)
fix: indentation issue in the Production Plan Summary report (#38019)

fix: Production Plan Summary report
(cherry picked from commit 4a111f73620136cda022e030c58d7d58b0c22a8e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-13 14:03:29 +05:30
mergify[bot]
915ca47515
fix: add translation wrapper (backport #37911) (#37947)
fix: add translation wrapper

(cherry picked from commit 8722318081e30544b4cc76c97bdd1fe3362373d6)

Co-authored-by: hyaray <hyaray@vip.qq.com>
2023-11-06 19:52:04 +05:30
mergify[bot]
df90fd7b35
feat: reserved production plan sub assembly items (backport #37884) (#37927)
feat: reserved production plan sub assembly items (#37884)

(cherry picked from commit 34d3eb88b39ffb437fc111ed03527f2c3c4baf9b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-11-06 11:33:12 +05:30
mergify[bot]
8b3c4a948c
fix: incorrect material request quantity in production plan (backport #37785) (#37790)
fix: incorrect material request quantity in production plan (#37785)

(cherry picked from commit 25718d9f1b7cda3b87263c2cf885958cbd283947)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-31 15:41:53 +05:30
mergify[bot]
f132552968
fix: make changes that enable gantt view for job cards (backport #37661) (#37757)
fix: make changes that enable gantt view for job cards (#37661)

* fix: make changes that enable gantt view for job cards

* fix: add fields on listview and remove from json file

* fix: undo modified date

---------

Co-authored-by: Dietmar Fischer <fischer@kk-software.de>
(cherry picked from commit 500435b856a028bdab7fdbe12647ec0f11287eab)

Co-authored-by: Didiman1998 <118364772+Didiman1998@users.noreply.github.com>
2023-10-30 15:20:40 +05:30
mergify[bot]
18e40dd032
refactor: remove extraneous disabled filters (backport #37732) (#37749)
refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f84979e12b8091492be7eddbf0caa56)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
2023-10-30 09:57:32 +05:30
mergify[bot]
2f5d991225
refactor: rename field Over Order Allowance to Blanket Order Allowance (backport #37669) (#37682)
* refactor: rename field `Over Order Allowance` to `Blanket Order Allowance`

(cherry picked from commit 8ffa2bfe25d8fae317d77705aec82a92dc269874)

* chore: patch to rename field `over_order_allowance`

(cherry picked from commit fcfcf6957e07ad5afc281e5f43154ca1170e14c4)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-25 14:58:01 +05:30
rohitwaghchaure
f3238f9105
fix: production plan reserved qty incorrect calculation (#37400) 2023-10-11 14:08:11 +05:30
mergify[bot]
9be554a147
chore: fix linter issue (backport #37349) (#37350)
chore: fix linter issue (#37349)

(cherry picked from commit e975a10a751cb1eb190ea7e06cc1eccca80554d2)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-03 22:11:10 +05:30
mergify[bot]
7729c1a413
fix: do not consider submitted Work Orders in the Production Plan Res… (backport #37343) (#37347)
fix: do not consider submitted Work Orders in the Production Plan Res… (#37343)

fix: do not consider submitted Work Orders in the Production Plan Reserve qty
(cherry picked from commit c3aeb2dec58190d16a18e2609fd57054bda54e43)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-03 22:05:01 +05:30
rohitwaghchaure
36364c235e fix: Description field for the 'Ignore Available Stock' (#37293)
(cherry picked from commit 7f1483ad707feac6413994400217413e5c167c7b)
2023-09-29 09:06:47 +00:00
mergify[bot]
f375c8cc7f
fix: incorrect qty for material request in Production Plan (backport #37270) (#37275)
fix: incorrect qty for material request in Production Plan (#37270)

(cherry picked from commit 8fe4a4d3aa7857e5e241bcb7145065753ab8b4cb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-09-27 23:35:53 +05:30
mergify[bot]
2cca37ad7d
fix: reserved qty for production plan (backport #37251) (#37253)
fix: reserved qty for production plan (#37251)

(cherry picked from commit 0a0d5b3e6612be1b6e1c9febd4a86a772a02511d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-09-26 18:29:54 +05:30
mergify[bot]
195de14810
fix: don't set from warehouse for purchase material request (backport #37132) (#37134)
fix: don't set from warehouse for purchase material request (#37132)

(cherry picked from commit e62b783f340844783352030de422c6be14b3ddfc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-09-18 22:31:22 +05:30
HENRY Florian
34bb64e41a
fix(ux): move get_route_options_for_new_doc to refresh (#37096)
fix: move `get_route_options_for_new_doc` to `refresh`
2023-09-16 15:59:09 +05:30