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

1434 Commits

Author SHA1 Message Date
Noah Jacob
73bfd59846
fix: checkbox triggers get_items and sub_assembly buttons (#28558) 2021-11-26 11:53:35 +05:30
Marica
ffdf32b5b3
Merge branch 'develop' into cost-of-poor-quality 2021-11-25 13:29:40 +05:30
marination
42395af22a fix: Remove commented code 2021-11-25 13:28:52 +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
Sagar Sharma
aa689874e3
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>
 2021-11-22 13:06:59 +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
marination
c192c135d4 Merge branch 'develop' of https://github.com/frappe/erpnext into cost-of-poor-quality 2021-11-16 19:15:47 +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
marination
1eb3ca2b86 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
 2021-11-09 23:07:28 +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
marination
e8d0c25dff 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
 2021-11-09 17:29:29 +05:30
Anupam Kumar
092936d8ba
Merge branch 'develop' into manufacturing-work-order-stop 2021-11-09 10:51:09 +05:30
Anupam
27709a1c71 fix: test cases 2021-11-09 09:56:58 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
marination
0aa237f38c test: Stock Entry from JC correctness (items mapping and qty) 2021-11-04 20:14:28 +05:30
Anupam
7044ae5e39 fix: testcases: 2021-11-03 17:41:04 +05:30
Noah Jacob
cb064b06ad
fix: added job_card_item link in material request (#28222) 
* fix: added job_card_item links in material request

* fix: add no copy to row references
 2021-11-03 11:53:57 +00:00
Anupam
cc15cf6ae2 fix: linter isuue 2021-11-03 13:54:46 +05:30
Anupam Kumar
8ebc412e8b
Merge branch 'develop' into manufacturing-work-order-stop 2021-11-03 13:41:37 +05:30
Anupam
ba47bd02b6 fix: sider isuue 2021-11-03 13:41:22 +05:30
Anupam
9b4c7e4796 fix: validate job card 2021-11-03 13:27:50 +05:30
Anupam
9c0906f1b5 fix: test cases 2021-11-02 20:43:00 +05:30
Anupam
e36da4d137 fix: linter issues 2021-11-02 12:53:00 +05:30
Anupam
59e4fd980c fix: linter issues 2021-11-02 12:46:00 +05:30
Anupam
530a0f481e fix: added testcase 2021-11-02 12:39:13 +05:30
Anupam
264b0df9ff fix: sider issue 2021-10-31 16:11:11 +05:30
Anupam
55e97dce8a fix: sider issue 2021-10-31 14:45:36 +05:30
Anupam
e290fe0721 fix: sider issue 2021-10-31 14:42:10 +05:30
Anupam
5d4c5652af feat: added confirm dialog on closing of workorder 2021-10-31 14:20:03 +05:30
Anupam
23af036894 feat: provision to close the Work Order 2021-10-29 17:27:17 +05:30
Marica
292419bc9e
fix: Skip empty rows while updating unsaved BOM cost (#28136) 
- Dont try to get valuation rate if row has no item code
- Dont try to add exploded items if row has no item code
 2021-10-29 13:49:27 +05:30
marination
8502ccb5b2 chore: Add comment hinting to reason 2021-10-28 16:53:45 +05:30
marination
27236b7e9e fix: Remove RM Cost column as cost is not retrievable from Job card 2021-10-28 16:45:23 +05:30
Ankush Menat
d81b87d9b3 fix(ux): make qty 1 by default in WO 2021-10-27 19:46:06 +05:30
Ankush Menat
5f9bd9b8e9 fix: remove bad hardcoded max value 2021-10-27 19:46:06 +05:30
Ankush Menat
e0cf45e7ec
fix(ux): misleading label for image fields (#28107) 2021-10-27 15:27:33 +05:30
Alan
05831b18ad
fix: update production plan status #27567 
fix: update production plan status
 2021-10-27 11:36:37 +05:30