Commit Graph

1531 Commits

Author SHA1 Message Date
Sagar Sharma
357d4994e4
Merge branch 'develop' into fix-22-23-05686 2023-03-14 20:59:38 +05:30
Sagar Sharma
258242f8d7
Merge branch 'develop' into FIX-ISS-22-23-05720 2023-03-14 18:17:48 +05:30
Ankush Menat
f95ad039e4
test: add timeout to all BOM related tests (#34446)
* Revert "chore: remove failing test (#34444)"

This reverts commit b89ecd482d.

* test: add timeout to bom tests
2023-03-14 18:10:17 +05:30
Deepesh Garg
b89ecd482d
chore: remove failing test (#34444) 2023-03-14 15:53:03 +05:30
s-aga-r
66f650061d test: add test cases for Over Order Allowance against Blanket Order 2023-03-13 17:21:07 +05:30
Sagar Sharma
9d49afebde
Merge branch 'develop' into fix-22-23-05686 2023-03-13 17:05:27 +05:30
s-aga-r
442ee3adba fix: operation time for multi-level BOM in WO 2023-03-13 14:31:38 +05:30
s-aga-r
046834a97a fix: required_qty get reset to 1 for Alternative Item in WO 2023-03-08 20:40:03 +05:30
Sagar Sharma
3952b3373d
Merge branch 'develop' into fix-22-23-05690 2023-03-07 10:50:39 +05:30
s-aga-r
de18f98c5c perf: Stock Entry (Material Transfer) 2023-03-06 23:41:04 +05:30
rohitwaghchaure
53efc8ff77
Merge pull request #34305 from rohitwaghchaure/fixed-not-able-to-complete-bom-update-log
fix: BOM Update log not completed
2023-03-06 23:23:58 +05:30
Rohit Waghchaure
2f157fa5d3 fix: BOM Update log not completed 2023-03-06 12:09:50 +05:30
s-aga-r
53701c37b1 feat: consider over_order_allowance while validating sales order qty 2023-03-03 22:03:54 +05:30
s-aga-r
fc1088d9c4 fix: don't map item row having 0 qty 2023-03-03 10:50:17 +05:30
s-aga-r
f3993783a3 refactor: rewrite blanket_order.py queries in QB 2023-03-02 17:18:46 +05:30
s-aga-r
abf9a28d6a fix: hide + button based on Blanket Order Type 2023-03-02 16:40:37 +05:30
Florian HENRY
86be259341 fix: BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table 2023-02-13 23:34:20 +01:00
Vishal
694fc3e20c fix: hide with_operation on selection on fg_based and vice versa 2023-01-11 18:52:30 +05:30
Vishal
a5cbdea8e4 fix: minor change in bom.js added 2023-01-10 13:40:12 +05:30
Vishal
c51f9e0a97 fix: bom.json updated 2023-01-10 07:48:26 +05:30
Vishal
f0c0a64984 fix: test case added for FG_BASED OPERTING COST 2023-01-10 07:43:28 +05:30
Vishal
ddc0127e05 fix: minor changes added 2023-01-10 07:43:20 +05:30
Vishal
b559245f2a feat: Add operating cost based on bom quanity without creating job card 2023-01-10 07:43:05 +05:30
rohitwaghchaure
d749c4aac2
Revert "feat: Add operating cost based on bom quanity without creating job card" 2023-01-09 23:35:11 +05:30
rohitwaghchaure
20fe1875e7
Merge pull request #33347 from vishdha/fb_based_operating_cost
feat: Add operating cost based on bom quanity without creating job card
2023-01-09 23:31:41 +05:30
Rohit Waghchaure
b0baba84a0 fix: incorrect status in the work order 2023-01-06 14:16:18 +05:30
Vishal
9fd1c3efb4 fix: test case added for FG_BASED OPERTING COST 2023-01-06 11:18:09 +05:30
Vishal
6b0b49ee3f fix: minor changes added 2023-01-06 11:18:09 +05:30
Vishal
bc1bdd58a7 feat: Add operating cost based on bom quanity without creating job card 2023-01-06 11:18:09 +05:30
Rohit Waghchaure
524c0994e0 test: test cases for process loss 2023-01-03 22:47:52 +05:30
Rohit Waghchaure
ae039777f9 refactor: revamp process loss feature & added tab breaks 2023-01-03 19:05:41 +05:30
Rohit Waghchaure
410a58b3de fix: get_serial_nos_for_fg() missing 1 required positional argument: 'args' 2022-12-14 15:33:36 +05:30
Rohit Waghchaure
713330cbf6 fix: non empty FG batch picked while completing work order 2022-12-05 18:15:13 +05:30
Rohit Waghchaure
e02f35c8ff feat: make Material Request for sub-assembly items 2022-11-28 16:20:46 +05:30
rohitwaghchaure
397a0e2a3a
Merge pull request #33118 from rohitwaghchaure/production-plan-ux-issues
fix: production plan UX
2022-11-27 08:46:39 +05:30
Rohit Waghchaure
8cb7112e72 fix: production plan UX 2022-11-26 15:02:27 +05:30
Rohit Waghchaure
87d37e90a2 fix: job card for quantity UX 2022-11-24 17:29:50 +05:30
rohitwaghchaure
31afae3e75
Merge branch 'develop' into workstation-type-feat-for-bom 2022-11-16 23:26:08 +05:30
Rohit Waghchaure
ffa30127e7 fix: linters failing 2022-11-16 23:23:06 +05:30
Rohit Waghchaure
7bd06e6fbc test: test case to check workstation type 2022-11-16 23:19:04 +05:30
rohitwaghchaure
91fad1935e
Merge pull request #32947 from rohitwaghchaure/incorrect-fix-of-conversion-factor-in-pp
fix: incorrect fix of conversion factor in PP
2022-11-15 10:30:23 +05:30
Rohit Waghchaure
105c272816 feat: Workstation Type for BOM 2022-11-14 13:03:03 +05:30
Rohit Waghchaure
490b0e3cdf fix: incorrect fix of conversion factor in PP 2022-11-14 10:10:49 +05:30
s-aga-r
7df2921d38 refactor: rewrite job_card.py queries in QB 2022-11-12 22:03:56 +05:30
Sagar Sharma
e7fa2e08ad fix: set WIP Warehouse in Job Card 2022-11-10 16:40:53 +05:30
Sagar Sharma
9730cd0aec fix: don't set WIP Warehouse if is checked in WO 2022-11-10 16:18:10 +05:30
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods (#32914)
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815
2022-11-09 20:09:06 +05:30
Sagar Sharma
5e8a22be24 fix: linter 2022-11-07 21:54:12 +05:30
Ankush Menat
30daeb90a8
fix: incorrect single valeu fetch
refer https://github.com/frappe/frappe/pull/18787

[skip ci]
2022-11-07 15:38:38 +05:30
Sagar Sharma
8ea6983734 fix: Material Consumption option in case of Skip Transfer to WIP in WO 2022-11-01 19:43:06 +05:30