Commit Graph

1419 Commits

Author SHA1 Message Date
Rohit Waghchaure
8d3f8619cf chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2022-01-18 00:01:14 +05:30
mergify[bot]
d5d7f67ac2 fix: cover case when all material needs to be bought (#29326) (#29327)
When material request is to be made for purchase qty should be converted
to purchase UOM

(cherry picked from commit 48f3d53556)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-17 22:16:41 +05:30
mergify[bot]
5e3f5d8bcc fix: purchase to Stock UOM conversion on Production Plan #28570 (#29325)
fix: purchase to Stock UOM conversion on Production Plan
(cherry picked from commit 9cd26fbb6a)

Co-authored-by: Maxwell Morais <MaxMorais@users.noreply.github.com>
2022-01-17 22:15:12 +05:30
mergify[bot]
83ca2422f6 fix: show work order progress bar even it is closed (#29312) (#29313)
(cherry picked from commit 4d48035828)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
2022-01-17 12:08:21 +05:30
rohitwaghchaure
b4fee6d065 fix: conflicts 2022-01-12 13:31:34 +05:30
rohitwaghchaure
fa66d1d87d fix: conflicts 2022-01-12 13:30:05 +05:30
Rohit Waghchaure
d71d769c7a fix: incorrect scrap item qty
(cherry picked from commit 8f0b2fa90e)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
2022-01-12 07:44:38 +00:00
mergify[bot]
819346f69f fix: "update cost" should ignore overridden routing times #29154 (#29235)
fix: "update cost" should ignore overridden routing times
(cherry picked from commit 754596dfc1)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-11 09:02:57 +00:00
Rohit Waghchaure
b378a225d0 chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-12-29 23:10:55 +05:30
Ankush Menat
9338843dac test: bin qty on backdated SR
(cherry picked from commit 2bb7bca464)
2021-12-20 14:36:40 +00:00
Ankush Menat
bdd43274b2 fix: incorrect logic for "Reserved Qty for Production" (#28880)
* fix: reservation for production incorrect

The query uses case to decide what fields to compute reservation on,
this case is outermost case hence the very first Work order's "Skip
transfer" is considered for ALL work orders.

Solution: move the case inside Sum.

Steps to reproduce:
1. Make work order for more than 1 qty (with | without skip transfer)
2. Create manufacture and transfer entries.
3. Keep checking reserved quantities during this process.

* test: use default warehouse for testing reservation

(cherry picked from commit 80f1a8c645)
2021-12-14 18:22:10 +05:30
Ankush Menat
25fd11e24f test: timeout certain tests in work order to avoid stuck tests (#28666) 2021-12-14 18:21:48 +05:30
Ankush Menat
73693ac153 test: remove commits from tests (#27939)
* test: remove commits from tests in selling module

* test: remove commits from manufacturing module

* test: remove commits from accounts module tests

* test: remove commits from controller tests

* test: keep commits in accounting dimension test

* Revert "test: remove commits from controller tests"

This reverts commit f5cfbee5da.

* Revert "test: remove commits from accounts module tests"

This reverts commit df4c27efdd.

(cherry picked from commit 96ef88d935)
2021-12-14 18:21:48 +05:30
mergify[bot]
1a986f0b11 fix(UX): hide RM table(Job Card) if material transfer is against work order (backport #28746)
* fix(UX): hide RM table(Job Card) if material transfer is against work order (#28746)

(cherry picked from commit cc8c0595e2)

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

* chore: resolve conflicts

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-14 12:44:42 +05:30
Rohit Waghchaure
a3189226a5 chore: merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-12-13 23:01:11 +05:30
mergify[bot]
d2fac14922 feat: added QI link in Job Card Dashboard (#28643) (#28810)
(cherry picked from commit f1c0190f02)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-12-09 20:31:42 +05:30
Rohit Waghchaure
ced223188f chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-11-29 19:41:48 +05:30
Rohit Waghchaure
1733c1c513 fix: changed fieldtype from int to float for the field Batch Size in the work order
(cherry picked from commit 7fac9b8e9c)
2021-11-29 11:44:25 +00:00
Ankush Menat
2768047c9b fix: use get_all instead of get_list for child tables
(cherry picked from commit f862339024)
2021-11-29 13:37:00 +05:30
mergify[bot]
eac67db985 fix: checkbox triggers get_items and sub_assembly buttons (#28558) (#28571)
(cherry picked from commit 73bfd59846)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-11-26 11:54:54 +05:30
Marica
66f02b0817 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28123 2021-11-25 18:46:56 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
marination
9fa8d02184 fix: Remove commented code
(cherry picked from commit 42395af22a)
2021-11-25 09:06:24 +00:00
marination
e47f7a3023 chore: Add comment hinting to reason
(cherry picked from commit 8502ccb5b2)
2021-11-25 09:06:24 +00:00
marination
8e9cd83c4b fix: Remove RM Cost column as cost is not retrievable from Job card
(cherry picked from commit 27236b7e9e)
2021-11-25 09:06:23 +00:00
mergify[bot]
32855073ff fix: fixes in work order doctype (#28217) (#28543)
* fix: fixes in work order doctype

* fix: sider issues and disabled set only once property

* fix: set default qty to manufacture

* fix: dont manually collapse sections

* fix: remove unnecessary messages

* fix: make dependent fields read only


Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-24 16:44:20 +05:30
Bhavesh Maheshwari
7ae1369d64 fix: broken bom tree view and remove duplicate button (#28512)
* fix: broken bom tree view and remove duplicate button

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-23 17:51:13 +05:30
mergify[bot]
dff3decd56 fix: Closed status error in Work Order Summary (backport #28460)
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-22 13:24:25 +05:30
mergify[bot]
1b4659f028 fix: Closed status error in Work Order Summary (backport #28460)
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-22 13:23:22 +05:30
mergify[bot]
6fdd5e990a chore: remove manual collapsing of section (#28435) (#28451)
(cherry picked from commit 8102e4a210)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-18 14:14:44 +05:30
mergify[bot]
840256ee31 chore: remove manual collapsing of section (#28435) (#28450)
(cherry picked from commit 8102e4a210)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-18 14:12:27 +05:30
mergify[bot]
a60c64857a fix: unchecking the "With Operations" in BOM clears operations table (backport #28446) (#28447)
* fix: unchecking the "With Operations" in BOM clears operations table #28446

(cherry picked from commit 488d34af1f)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.js

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-18 14:11:45 +05:30
mergify[bot]
b4db3362e0 fix: added job_card_item link in material request (#28222) (#28434)
* fix: added job_card_item links in material request

* fix: add no copy to row references

(cherry picked from commit cb064b06ad)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-11-17 19:37:20 +05:30
mergify[bot]
b961ad6789 fix: added job_card_item link in material request (#28222) (#28433)
* fix: added job_card_item links in material request

* fix: add no copy to row references

(cherry picked from commit cb064b06ad)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-11-17 19:37:08 +05:30
Rohit Waghchaure
d556645455 Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2021-11-16 21:25:53 +05:30
marination
a34eae7bc7 fix: test_job_card_partial_material_transfer test
- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274d79)
2021-11-16 13:08:31 +00:00
marination
d086039f1b fix: Server side test
- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba7a8)
2021-11-16 13:08:30 +00:00
marination
619c066f67 fix: (travis) Production Plan Summary Report breaks if no WO
- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2b86)
2021-11-16 13:08:29 +00:00
marination
0ee54b0779 fix: Partial Trabsfers against JC
- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25dff)
2021-11-16 13:08:28 +00:00
marination
e3dcccdd18 test: Stock Entry from JC correctness (items mapping and qty)
(cherry picked from commit 0aa237f38c)
2021-11-16 13:08:26 +00:00
mergify[bot]
09251b3ddf refactor: fix help section background in dark mode (#28406) (#28408)
(cherry picked from commit 952fc87c99)

Co-authored-by: Ahmed Shareef <46922290+penieldev@users.noreply.github.com>
2021-11-16 14:32:23 +05:30
mergify[bot]
68ff68a357 fix: Collapse Scrap Items in Job Card (backport #28362) (#28368)
* fix: Collapse Scrap Items in Job Card (#28362)

(cherry picked from commit a424310581)

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

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-12 14:41:00 +05:30
Ankush Menat
65844932cc fix: use completion qty instead of transfer quantity for JC status
(cherry picked from commit 37799fe3dd)
2021-11-09 18:37:07 +05:30
rohitwaghchaure
9869b17ee0 Merge pull request #28291 from frappe/mergify/bp/version-13-hotfix/pr-28150
feat: provision to close the Work Order (backport #28150)
2021-11-09 16:40:46 +05:30
rohitwaghchaure
346c76cf38 Merge pull request #28290 from frappe/mergify/bp/version-13-pre-release/pr-28150
feat: provision to close the Work Order (backport #28150)
2021-11-09 16:38:10 +05:30
Diksha Jadhav
bb9713a7b2 refactor: use fetch from property for qi template on job card
(cherry picked from commit 467324c87f)
2021-11-09 10:23:00 +00:00
Diksha Jadhav
ac54e80856 feat: provision to have limited parameters for in-process quality inspection
(cherry picked from commit 6c45f8b2c4)
2021-11-09 10:22:59 +00:00
Diksha Jadhav
3c78ac21d9 feat(manufacturing): add link field for quality inspection template on operation
(cherry picked from commit 281a9cc749)
2021-11-09 10:22:58 +00:00
Anupam
7e256e220b fix: test cases
(cherry picked from commit 27709a1c71)
2021-11-09 10:17:09 +00:00
Anupam
26c23719a0 fix: testcases:
(cherry picked from commit 7044ae5e39)
2021-11-09 10:17:08 +00:00