Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,428 Commits 3 Branches 0 Tags 1 GiB
eaccef6116
Commit Graph

1316 Commits

Author SHA1 Message Date
marination
eaccef6116 fix: Initialise pending qty as planned qty for independent item rows in Prod Plan 
- Rows that are not fetched from MR or SO, had pending qty 0 throughout
- Initialise pending qty on save only.
- After submit this field will be updated by work order/stock entry
- Bring functions in `validate()` closer to the top
 2022-02-08 17:55:38 +05:30
marination
7116d7ae0e fix: Set Pending Qty in Prod Plan after updating Work Order 2022-02-08 12:40:33 +05:30
Ankush Menat
9b60e3f187
fix: default qty if not found 2022-02-03 15:26:57 +05:30
Sagar Sharma
be09551cfa test: add test case for multiple WO 
(cherry picked from commit 36609c50c0332498ee088e6f44759f7c2747c733)
 2022-02-03 09:50:08 +00:00
Sagar Sharma
360a06b9ba fix: ordered_qty for production-plan-item 
(cherry picked from commit 4e58c1da3ac1649d64377d53aec68e489a4a9d41)
 2022-02-03 09:50:07 +00:00
Ankush Menat
a3a05c0c23
fix: don't show "create" on cancelled BOMs (#29570) 2022-02-01 17:40:06 +05:30
Ankush Menat
d38fd8635c fix(ux): sort multi-production item plans correctly 2022-01-30 22:58:30 +05:30
Ankush Menat
157b4b33fe refactor!: dynamically compute bom_level 2022-01-30 22:06:24 +05:30
Ankush Menat
43bd88e741 fix: work order serial no allows storing whitespace 2022-01-29 14:01:21 +05:30
Ankush Menat
28994c0e76 test: delete data after running test 2022-01-28 13:50:57 +05:30
Ankush Menat
86efa0dbfd fix: ensure correct-ish transfer against 2022-01-28 13:22:47 +05:30
rohitwaghchaure
b75b00fefc
feat: provision to exclude exploded items in the BOM (#29450) 2022-01-27 12:44:01 +05:30
Ankush Menat
b8fbfed096
fix: fetch "transfer material against" from BOM (#29435) 2022-01-24 21:45:51 +05:30
rohitwaghchaure
19b1b7f8cc
Merge pull request #29419 from rohitwaghchaure/fix-incorrect-rm-qty-in-stock-entry 
fix: incorrect raw materials quantity in manufacture stock entry
 2022-01-24 12:13:54 +05:30
Rohit Waghchaure
f8d232ac26 fix: incorrect raw materials quantity in manufacture stock entry 2022-01-24 11:35:06 +05:30
Ankush Menat
7e407bcc42
fix: show stock UOM for material transfers (#29376) 2022-01-20 14:49:39 +05:30
Ankush Menat
48f3d53556
fix: cover case when all material needs to be bought (#29326) 
When material request is to be made for purchase qty should be converted
to purchase UOM
 2022-01-17 22:14:42 +05:30
Maxwell Morais
9cd26fbb6a
fix: purchase to Stock UOM conversion on Production Plan #28570 
fix: purchase to Stock UOM conversion on Production Plan
 2022-01-17 21:50:18 +05:30
Anupam Kumar
4d48035828
fix: show work order progress bar even it is closed (#29312) 2022-01-17 11:49:57 +05:30
rohitwaghchaure
71466c6456
Merge pull request #29179 from rohitwaghchaure/fixed-incorrect-scrap-qty-in-manufacture 
fix: incorrect scrap item qty
 2022-01-12 13:13:30 +05:30
Rohit Waghchaure
8f0b2fa90e fix: incorrect scrap item qty 2022-01-12 11:30:20 +05:30
Ankush Menat
754596dfc1
fix: "update cost" should ignore overridden routing times #29154 
fix: "update cost" should ignore overridden routing times
 2022-01-11 14:20:44 +05:30
Ankush Menat
2bb7bca464 test: bin qty on backdated SR 2021-12-20 20:05:49 +05:30
Ankush Menat
f5d5281119 chore: drop deprecated qunit tests 2021-12-20 17:03:10 +05:30
DeeMysterio
2be62c279f
feat: provision to have limited parameters for in-process quality ins… (#28549) 
* feat: provision to have limited parameters for in-process quality inspection

* chore: formatting
 2021-12-15 19:41:30 +05:30
HENRY Florian
29f6852c13
feat: Manufacturing : in BOM Operation time can be fix (#27063) 
* feat: Operation time can be fixed

* better coding without duplicate code

* change modified date foir doctype

* undo change

* fix varmixing

* fix varmixing

* fix: remove f-string that's not required anymore

* refactor: use ORM instead of raw query

* fix: improve description

* test: basic test for fixed time

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-15 15:08:31 +05:30
Ankush Menat
96ef88d935
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 f5cfbee5da844f8b2bffeee907ac602754f16ff4.

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

This reverts commit df4c27efddf355e2731a18e8871e54d18590f219.
 2021-12-14 17:36:35 +05:30
Ankush Menat
80f1a8c645
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
 2021-12-14 17:02:42 +05:30
Noah Jacob
cc8c0595e2
fix(UX): hide RM table(Job Card) if material transfer is against work order (#28746) 2021-12-14 12:20:04 +05:30
Rucha Mahabal
bb97309e2e fix: tests 
- specify sorting order in employee exits query

- rollback after work order tests
 2021-12-12 23:20:04 +05:30
Noah Jacob
f1c0190f02
feat: added QI link in Job Card Dashboard (#28643) 2021-12-09 20:21:17 +05:30
Ankush Menat
445966ab80
test: timeout certain tests in work order to avoid stuck tests (#28666) 
[skip ci]
 2021-12-01 16:34:05 +05:30
Rohit Waghchaure
7fac9b8e9c fix: changed fieldtype from int to float for the field Batch Size in the work order 2021-11-29 16:40:55 +05:30
Noah Jacob
73bfd59846
fix: checkbox triggers get_items and sub_assembly buttons (#28558) 2021-11-26 11:53:35 +05:30
Mohammed Yusuf Shaikh
8d2abc4b86
fix: fixes in work order doctype (#28217) 
* 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: Ankush Menat <ankush@frappe.io>
 2021-11-24 16:23:12 +05:30
mergify[bot]
34d1fec7de
fix: broken bom tree view and remove duplicate button (#28512) (#28527) 
* fix: broken bom tree view and remove duplicate button

(cherry picked from commit 7ae1369d64ecaa829965d89915475fbd3211b5c2)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-23 17:53:26 +05:30
Anupam Kumar
44303f93cc
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-22 10:36:02 +05:30
Sagar Sharma
488d34af1f
fix: unchecking the "With Operations" in BOM clears operations table #28446 2021-11-18 13:57:13 +05:30
Ankush Menat
8102e4a210
chore: remove manual collapsing of section (#28435) 2021-11-17 17:05:07 +05:30
Anupam Kumar
37aa2cb271
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-16 19:35:20 +05:30
Marica
612bb5c749
Merge branch 'develop' into se-required-items-from-jc 2021-11-16 18:03:40 +05:30
marination
a5f8274d79 fix: test_job_card_partial_material_transfer test 
- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable
 2021-11-16 15:13:19 +05:30
Ahmed Shareef
952fc87c99
refactor: fix help section background in dark mode (#28406) 2021-11-16 14:30:13 +05:30
marination
bb561ba7a8 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
 2021-11-15 15:21:20 +05:30
Sagar Sharma
a424310581
fix: Collapse Scrap Items in Job Card (#28362) 2021-11-12 13:50:30 +05:30
Marica
18f9e3558e
Merge branch 'develop' into se-required-items-from-jc 2021-11-11 11:14:37 +05:30
Anupam
1a7851b1ad fix: error message 2021-11-10 14:55:13 +05:30
Anupam
68dc42fb1f fix: function name [is_work_order_stopped -> is_work_order_closed] 2021-11-10 10:12:29 +05:30
Ankush Menat
37799fe3dd fix: use completion qty instead of transfer quantity for JC status 2021-11-09 18:04:50 +05:30
Marica
031178224f
Merge branch 'develop' into se-required-items-from-jc 2021-11-09 17:33:20 +05:30