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

1525 Commits

Author SHA1 Message Date
Raffael Meyer
0a015b7f70
refactor: remove redundant if-statement (#30311) 2022-03-20 19:29:41 +05:30
mergify[bot]
e8310c6dec
fix: Job Card sub operations status and list view (backport #30243) (#30256) 
* fix: show status in job card list view in Draft mode

(cherry picked from commit fa32fc3c832196004154055ac1b2334d6202c261)

* fix: job card - sub operations table status misbehaviour on pause / resume Job Card

(cherry picked from commit 7b8723445ee695e88590bb833f60a0c4731106fa)

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
 2022-03-15 15:48:15 +05:30
Ankush Menat
8e559f01c8 test: refactor BOM quality template test 2022-03-14 18:28:08 +05:30
Florian HENRY
9415229e8d fix: BOM - clear Quality Inspection Template according to Inspection Quality Required 
Squashed commit of the following:

commit b73fa210b234d2c8067db2c32f94f362b89afe5a
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Mon Mar 14 08:30:24 2022 +0100

    add json tes

commit 984d015a7d9aceb6ea64be7ed9f1cc0caa356714
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Mon Mar 14 08:30:06 2022 +0100

    better test

commit 42061146658598da02eda7cb781bd2cf44c8ca34
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 16:12:57 2022 +0100

    update test

commit 6259c0957566600b044fcd4a5e14e69cdff71020
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 13:59:13 2022 +0100

    update test

commit cbc4ad9566f6f7f01dd622651458fea309d80954
Merge: faa44b3fdd 94d0f8d4e7
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 12:46:48 2022 +0100

    Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_30190

commit faa44b3fdd983adfc04bbf04a7ebfef114501bb3
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 12:03:35 2022 +0100

    fix: clear Quality Inspection Template according to Inspection Quality Required
 2022-03-14 18:25:00 +05:30
Sagar Sharma
884cd814bc test: add test for planned_qty 
(cherry picked from commit b22bdc5ff762d41242c742bb3f6fda64eb98fd2e)
 2022-03-14 11:31:52 +00:00
Sagar Sharma
3b86d6c73c fix: max_qty validation condition 
(cherry picked from commit d198c488a4071d13d0891d87f790562febd44b3e)
 2022-03-14 11:31:52 +00:00
Ankush Menat
6ee904d641 test: dont resubmit work order 2022-03-14 15:13:37 +05:30
Ankush Menat
1af13ca4bf fix(ux): remove get item buttons from submitted production plan 2022-03-14 14:15:43 +05:30
Ankush Menat
941ea1ec74 fix(ux): skip items without batch series 2022-03-14 10:25:18 +05:30
Ankush Menat
94d0f8d4e7 test: actual bom naming test 2022-03-11 17:11:22 +05:30
Rohan Bansal
67d8a7ba86 fix: cancelled document check 2022-03-11 17:11:22 +05:30
Ankush Menat
6b58d53403 refactor: split versioning code for testability 2022-03-11 17:11:22 +05:30
Rohan Bansal
7f2670941c fix: improve bom autoname logic 2022-03-11 17:11:22 +05:30
Ankush Menat
e2c99e02a9 test: bom for item_code that is >VARCHAR_LEN 2022-03-11 17:11:22 +05:30
Rohan Bansal
d9c91748f4 fix: if an item code is too long, truncate before setting BOM name 2022-03-11 17:11:22 +05:30
Ankush Menat
362102e802 fix: dont hardcode hour rate precision 2022-03-10 17:23:50 +05:30
Ankush Menat
18e2a33a9b fix: fetch new fields in bom from routing 2022-03-10 17:23:50 +05:30
Ankush Menat
9ef35ef773 fix: dont hardcode precision in routing 
Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
 2022-03-02 18:27:22 +05:30
Ankush Menat
f8ac4c082a fix: remove dead dashboard links 2022-03-02 18:27:22 +05:30
marination
1d1d586d4d test: Included sub assembly non-merging in test case 2022-03-01 15:42:34 +05:30
marination
ffbb2c8311 fix: Assert False for test that is anticipating an empty table and remove second arg to assertTrue 2022-03-01 12:57:09 +05:30
marination
25fa6344a6 test: Adjust test as per teardown 
- make tests use multi level bom in WO, as BOM at setup is used
- earlier, an intermediate BOM made in a test would override the BOM at setup
 2022-03-01 12:24:45 +05:30
Marica
5fe8c48ba8
Merge branch 'develop' into prod-plan-sub-items-aggregate 2022-02-28 17:38:14 +05:30
Ankush Menat
b0d1e6db54 test(refactor): use FrappeTestCase 2022-02-28 17:23:32 +05:30
marination
292fe370db test: combine sub assembly items and make Production Plan tests atomic 2022-02-28 16:35:20 +05:30
Marica
b8593188f3
Merge branch 'develop' into prod-plan-sub-items-aggregate 2022-02-28 15:08:21 +05:30
Ankush Menat
1d1203d5ec fix: dont fetch draft/cancelled BOMs 2022-02-28 13:14:16 +05:30
mergify[bot]
96e87fe3c9
fix: validate Work Order qty against Production Plan (#29721) (#30003) 
* fix: validate Work Order qty against Production Plan

* chore: err msg when max_qty is 0

* test: add test for overproduction

* fix: CI

(cherry picked from commit 067ede76ea0851a29e270e150f482368e0afa194)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-02-26 12:54:13 +05:30
marination
6d72aa377f feat: Combine Sub-assembly items in Production Plan 
- Combine subassembly rows if same Item, Warehouse, Inhouse/Outhouse Manu.g, BOM No.
 2022-02-24 15:20:18 +05:30
Ankush Menat
5d403449bd
test: move report tests to subttest (#29945) 
Basically failfast=False but for sub-tests
 2022-02-22 19:24:49 +05:30
Sagar Sharma
e4c4dc402e
fix: JobCard TimeLog to_date (#29872) 2022-02-21 19:49:19 +05:30
Ankush Menat
db93f26f20 fix: production plan status should consider qty + WO status 2022-02-17 14:48:32 +05:30
rohitwaghchaure
0da39950d8
Merge pull request #29836 from rohitwaghchaure/minor-item-name-in-excel-sheet 
feat (minor): added item name in the excel sheet
 2022-02-17 14:37:51 +05:30
Rohit Waghchaure
02e77029fa fix: added item name in the excel sheet 2022-02-16 18:15:57 +05:30
Marica
599f4b1412
Merge pull request #29705 from marination/pending-qty-in-prod-plan 
fix: Set Pending Qty in Prod Plan after updating Work Order
 2022-02-14 23:01:51 +05:30
marination
e46a1bc80f fix: Server Tests and sider 2022-02-14 21:00:51 +05:30
rohitwaghchaure
ce79434a9b
Merge pull request #29736 from rohitwaghchaure/performance-issue-while-making-wo 
fix: time out error while making work orders from production plan
 2022-02-11 16:12:21 +05:30
marination
86ca41b14a test: Production Plan Pending Qty impact tests 
- Two tests to check impact on pending qty: From SO and independent Prod Plan
- Added docstring to each test case for brief summary
- Changed helper function args to fallback to 0 instead of 1 if no arg is passed
- Removed unnecessary `get_doc()`
- Made helper function actions optional depending on args passed
 2022-02-10 20:14:28 +05:30
Rohit Waghchaure
eec2f87088 fix: time out error while making work orders from prodcution plan 2022-02-10 12:30:41 +05:30
Ankush Menat
2abc1c244e
Merge pull request #29715 from aaronmenezes/fix_reserved_for_production_calc 
fix: Reserved for Production calculation considered closed work orders
 2022-02-09 15:59:52 +05:30
Ankush Menat
a8bf3a3f0d refactor: move reserve quantity computation to work order 2022-02-09 11:26:03 +05:30
Ankush Menat
d2cc5f2482 test: remove dependency on other tests 2022-02-09 11:19:01 +05:30
aaronmenezes
6a8b7eeffe fix: Reserved for Production calculation considered closed work orders 2022-02-08 19:25:49 +05:30
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
Ankush Menat
bb105a33b2 test: validate on save instead of on creation 
(cherry picked from commit 0efd5577bd9bdc0bb900d4d23d85aa86fd09929a)
 2022-02-08 14:01:41 +05:30
marination
7116d7ae0e fix: Set Pending Qty in Prod Plan after updating Work Order 2022-02-08 12:40:33 +05:30
Ritwik Puri
72a812f18b
fix: use item_code instead of parent field in bom_stock_calculated report (#29684) 2022-02-07 19:43:29 +05:30
Ankush Menat
6459ceaea1 fix: dont show cancelled PO items in plan report 2022-02-06 19:05:12 +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