Vishnu VS
5c94f2cc52
Update erpnext/manufacturing/doctype/job_card/job_card.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2023-04-26 20:25:15 +05:30
Vishnu VS
25d0119b7e
Merge branch 'develop' into develop
2023-04-26 18:56:09 +05:30
Nandhinidevi123
74fb2bec3a
add if condition for workstation filter
2023-04-25 20:08:35 +05:30
Vishnu VS
cdb05cd310
Merge branch 'develop' into develop
2023-04-25 09:29:47 +05:30
Rohit Waghchaure
02c3b41dc2
fix: item not showing in the BOM
2023-04-24 14:50:27 +05:30
Vishnu VS
dc0e64a72d
Merge branch 'frappe:develop' into develop
2023-04-22 23:15:42 +05:30
rohitwaghchaure
9fa72cb9d8
Merge pull request #34982 from rohitwaghchaure/fixed-added-validation-for-extra-job-card
...
fix: added validation for extra job cards
2023-04-21 18:50:39 +05:30
Rohit Waghchaure
6a0b7c9e8c
fix: added validation for extra job card
2023-04-21 17:34:22 +05:30
Sagar Sharma
81653e4762
Merge branch 'develop' into FIX-ISS-23-24-00209
2023-04-20 15:46:01 +05:30
s-aga-r
8108b2de0a
fix: PermissionError in Work Order
2023-04-20 15:41:37 +05:30
Nihantra Patel
b572bef71d
fix: process_loss_percentage in BOM
2023-04-20 14:32:32 +05:30
Vishnu VS
194ed1842f
fix: update workstation hour rate
2023-04-13 19:02:03 +05:30
Rohit Waghchaure
82a136f991
fix: UX for stock entry, bom and work order
2023-04-06 12:51:32 +05:30
Rohit Waghchaure
d56070301c
fix: bom update log not working for large batch size
2023-04-03 14:47:58 +05:30
Sagar Sharma
b4ace345f9
Merge branch 'develop' into FIX-33830
2023-03-31 12:35:45 +05:30
s-aga-r
706be2a415
chore: make Production Plan Item Reference table hidden in Production Plan
2023-03-31 10:32:49 +05:30
s-aga-r
a4112c75c5
fix: BOM Update Cost, when no actual qty
2023-03-30 13:46:50 +05:30
Rohit Waghchaure
34c190b7d6
fix: Time button not working in the job card
2023-03-23 22:32:11 +05:30
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
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
s-aga-r
b53dcb04ed
test: add test cases for BOM Stock Report
2023-03-08 14:00:06 +05:30
s-aga-r
a65b80911b
fix: BOM Stock Report
2023-03-08 12:59:50 +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
rohitwaghchaure
e3de216e06
Merge pull request #34173 from rohitwaghchaure/incorrect-color-showing-in-report
...
fix: incorrect color in the BOM Stock Report
2023-02-23 09:54:45 +05:30
Rohit Waghchaure
a8f03ebf7f
fix: incorrect color in the BOM Stock Report
2023-02-22 14:24:18 +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 Dhayagude
f19212b5c8
Merge branch 'develop' into fg_based_operating_cost
2023-01-17 13:02:25 +05:30
Rohit Waghchaure
20c8873208
feat: provision to select date type based on filter
2023-01-16 23:29:13 +05:30
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
rohitwaghchaure
21c86bd649
Merge pull request #33332 from rohitwaghchaure/fixed--missing-required-argument
...
fix: get_serial_nos_for_fg() missing 1 required positional argument: …
2022-12-14 16:06:58 +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
s-aga-r
723c64ba73
fix: Enough Parts to Build in BOM Stock Report
2022-12-13 14:00:30 +05:30
s-aga-r
632c08f7e0
fix: order status in Production Planning Report
2022-12-07 22:47:06 +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
s-aga-r
ef7fd670fc
fix: production_item filter in Job Card Summary Report
2022-11-26 16:57:38 +05:30
s-aga-r
481149814e
fix: company name with , in Job Card Summary Report
2022-11-26 16:55:45 +05:30
s-aga-r
2e4f3e9317
fix: Work Order filter typo in Job Card Summary Report
2022-11-26 16:54:53 +05:30
s-aga-r
87b39f045c
fix: company name with , in Work Order Summary Report
2022-11-26 16:39:32 +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
rohitwaghchaure
adeb1f92c8
Merge pull request #32667 from rohitwaghchaure/fixed-bom-cost-update-message
...
fix: BOM cost update message
2022-10-20 14:36:43 +05:30
Rohit Waghchaure
9cfe527492
fix: BOM cost update message
2022-10-20 13:49:46 +05:30
rohitwaghchaure
873502c95d
Merge pull request #32654 from rohitwaghchaure/fixed-conversion-issue-in-material-request
...
fix: incorrect qty in material request created from PP
2022-10-20 09:59:19 +05:30
Rohit Waghchaure
4d5ef721f7
test: validate qty and purchase uom in material request which is created from PP
2022-10-19 19:08:27 +05:30
Rohit Waghchaure
ad278b2007
fix: incorrect qty in material request
2022-10-19 18:38:34 +05:30
Rohit Waghchaure
8b2165e0d1
fix: overlap error not raised for job card in case of workstation with production capacity
2022-10-19 14:19:50 +05:30
Rohit Waghchaure
d59ed24e6c
feat: provision to return non consumed components against the work order
2022-10-07 22:45:53 +05:30
Sagar Sharma
05392e0918
fix: consider overproduction percentage for WO finish button
2022-09-27 15:30:08 +05:30
rohitwaghchaure
6a67cc96d0
Merge pull request #32049 from djpalshikar/patch-1
...
Allow Item Templates in Work Order Items
2022-09-26 20:27:33 +05:30
Deepesh Garg
389fa180c8
Merge pull request #32276 from ernestoruiz89/patch-4
...
fix: add some strings to translate function
2022-09-26 16:39:04 +05:30
Sagar Sharma
729193aca8
Merge branch 'develop' into refactor/report/production-planning-report
2022-09-22 11:18:02 +05:30
Sagar Sharma
8417b9b99c
refactor: rewrite Production Planning Report queries in QB
2022-09-22 11:17:11 +05:30
rohitwaghchaure
d7e699ea1a
Merge pull request #32309 from rohitwaghchaure/fixed-item-code-key-error
...
fix: item_code key error in production plan
2022-09-21 15:27:43 +05:30
Rohit Waghchaure
caf23e6b8e
fix: item_code key error in production plan
2022-09-21 13:11:51 +05:30
Sagar Sharma
86c9ce9c20
Merge branch 'develop' into refactor/report/exponential-smoothing-forecasting
2022-09-21 10:25:47 +05:30
Sagar Sharma
1c0f1a2831
Merge branch 'develop' into refactor/report/exponential-smoothing-forecasting
2022-09-21 09:55:28 +05:30
Sagar Sharma
56f9c1b6f7
refactor: rewrite Exponential Smoothing Forecasting queries in QB
2022-09-21 09:54:38 +05:30
Sagar Sharma
d3a6881737
Merge branch 'develop' into refactor/report/bom-variance-report
2022-09-20 23:11:08 +05:30
Sagar Sharma
19e64eb247
refactor: rewrite BOM Variance Report queries in QB
2022-09-20 17:56:47 +05:30
