s-aga-r
4b5454c752
fix(ux): set route options for new SBB
2023-06-16 15:04:37 +05:30
s-aga-r
d176d86e2c
fix: Process Loss Report
2023-06-15 16:01:08 +05:30
rohitwaghchaure
4820221a41
Merge pull request #35636 from s-aga-r/FIX-SBB-AttributeError
...
fix: miscellaneous
2023-06-14 16:02:04 +05:30
s-aga-r
7549a5c371
fix(ux): add filters for SBB
2023-06-14 15:04:51 +05:30
Ankush Menat
a3ea985348
refactor: Use db.set_single_value ( #35668 )
...
I just applied semgrep autofix. Untested completed, review before merging.
```yaml
- id: frappe-set-value-semantics
patterns:
- pattern-either:
- pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
- pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
message: |
If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
languages: [python]
severity: ERROR
```
2023-06-13 17:30:38 +05:30
rohitwaghchaure
93fe923e2a
Merge branch 'develop' into fixed-process-loss-in-job-card
2023-06-12 19:04:19 +05:30
Rohit Waghchaure
0382eecff4
fix: test case
2023-06-12 18:20:38 +05:30
Rohit Waghchaure
e9a6191af9
fix: added process loss in job card
2023-06-09 20:33:46 +05:30
Ankush Menat
4507cb3cd7
fix: enqueue_after_commit wherever it makes sense ( #35588 )
2023-06-07 11:58:36 +05:30
Rohit Waghchaure
f4cfc589c6
fix: serial and batch selector
2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f8bf4aa7c8
fix: travis for work order, pos invoice and landed cost voucher
2023-06-02 17:14:17 +05:30
Rohit Waghchaure
d3ceb07936
fix: travis
2023-06-02 17:14:17 +05:30
Rohit Waghchaure
16f26fb3d8
refactor: serial and batch package creation for finished item and cleanup code
2023-06-02 17:14:15 +05:30
Rohit Waghchaure
e6143abb8a
refactor: added new file serial batch bundle
2023-06-02 17:14:14 +05:30
Rohit Waghchaure
6c9b212dd1
fix: removed sales and purchase fields from serial nos
2023-06-02 17:14:14 +05:30
rohitwaghchaure
cb19ebcd85
Merge pull request #35482 from rohitwaghchaure/fixed-stock-entry-missing-bom-details
...
fix: missing bom details in the stock entry
2023-05-31 17:29:19 +05:30
Ankush Menat
4bdd276f74
Merge pull request #35409 from nabinhait/workspace-cleanup
...
refactor: Workspace cleanup
2023-05-31 16:40:26 +05:30
Rohit Waghchaure
2fc7d82324
fix: missing bom details in the stock entry
2023-05-30 18:22:48 +05:30
Rohit Waghchaure
d3a5e49db9
fix: incorrect transfer quantity in the job card
2023-05-30 17:27:16 +05:30
Nabin Hait
5cf4c8c8b7
fix: removed duplicate links of manufacturing workspace
2023-05-30 13:18:58 +05:30
Nabin Hait
243c49c550
refactor: Workspace cleanup
2023-05-30 13:17:59 +05:30
rohitwaghchaure
693133d8f7
Merge pull request #35410 from rohitwaghchaure/fixed-negative-reserved-qty-for-production-plan
...
fix: Negative value in Reserved Qty for Production Plan
2023-05-24 19:08:14 +05:30
Rohit Waghchaure
a37608a36c
fix: Negative value in Reserved Qty for Production Plan
2023-05-24 17:14:00 +05:30
Rohit Waghchaure
8e3463c4ef
fix: available qty not fetching for raw material in PP
2023-05-24 14:12:58 +05:30
Sagar Sharma
00bb8add40
Merge pull request #35380 from CodeVenturers/OpenContrib
...
fix: TypeError while saving Job card
2023-05-23 10:49:42 +05:30
vishnu
8c34cc0e00
fix: use flt instead of mandatory field
2023-05-23 04:27:50 +00:00
Rohit Waghchaure
9dd566c1e8
test: test case to skip available qty for sub-assembly items
2023-05-23 01:02:16 +05:30
Rohit Waghchaure
64751ec4d9
feat: provision to skip available sub assembly items in the production plan
2023-05-23 00:16:48 +05:30
vishnu
a209fb4b64
fix: error while saving job card
2023-05-22 18:00:50 +00:00
Rohit Waghchaure
2879cb7c28
fix: bom item filter issue
2023-05-12 13:08:37 +05:30
rohitwaghchaure
bf29ec4341
Merge pull request #35227 from rohitwaghchaure/fixed-do-not-include-manufacturing-item
...
fix: non manufacturing items/fixed asset items in BOM
2023-05-09 18:47:36 +05:30
Rohit Waghchaure
aba8431d70
fix: non manufacturing items/fixed asset items in BOM
2023-05-09 16:48:30 +05:30
rohitwaghchaure
530edaf3d1
Merge branch 'develop' into develop
2023-05-07 19:58:42 +05:30
Ritwik Puri
140cec8eb2
Merge branch 'develop' into fix-incorrect-fg-item-qty-in-job-po
2023-05-06 22:49:09 +05:30
Rohit Waghchaure
af16fbb0a3
fix: incorrect fg item quantity in subcontracted PO
2023-05-06 20:30:53 +05:30
Rohit Waghchaure
8167b24219
fix: not allow to transfer excess materials against the job card
2023-05-04 18:24:16 +05:30
rohitwaghchaure
bea8f481b4
Merge pull request #35148 from rohitwaghchaure/fixed-extra-job-card-quantity-issue
...
fix: over production percentage not considered in validation
2023-05-04 00:13:53 +05:30
Rohit Waghchaure
a84d0af81e
fix: over production percentage not considered in validation
2023-05-03 23:22:59 +05:30
Rohit Waghchaure
06e91e758f
feat: reserve qty against production plan raw materials in BIN
2023-05-03 18:21:23 +05:30
Vishnu VS
bb13c236b9
Merge branch 'develop' into develop
2023-04-28 14:06:12 +05:30
Nihantra Patel
72dd7884a8
fix: Hyperlink in Quality Inspection Summary
2023-04-27 17:04:39 +05:30
Vishnu VS
f68eef833c
Update erpnext/manufacturing/doctype/job_card/job_card.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2023-04-26 20:25:43 +05:30
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
