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

1238 Commits

Author SHA1 Message Date
Alan
ece446ffe5
fix: update variant qty in BOM, Create Work Order dialog (#27686) 2021-10-01 20:32:13 +05:30
Noah Jacob
5c249decbb
fix(ux): added exception of template item in filters (#27560) 2021-09-27 22:34:27 +05:30
Frappe PR Bot
2af6ea68ae
fix: remove unknown field employee_name from query (bp #27634) 
* fix: remove unknown field employee_name from query

* fix: remove unknown fieldname

Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3d28e2c94eb2761f1864c88b6eb1e59)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
 2021-09-21 20:33:09 +05:30
Marica
9110223341
fix: (ux) Use subassembly schedule date while making WO from Prod Plan (#27628) 
- Set subassemply WO's planned start date from Production Plan
 2021-09-21 16:50:14 +05:30
Ankush Menat
78fe92542c
fix(ProdPlan): Get SubAssy Items does not work (#27537) 
* fix(ProdPlan): Get SubAssy Items does not work

This button wasn't working unless the document was saved already.

* fix: make form dirty when subassy item are fetched
 2021-09-16 15:34:50 +05:30
rohitwaghchaure
c5a77f60ed
feat: provision to add scrap item in job card (#27483) 2021-09-15 16:45:57 +05:30
rohitwaghchaure
2e2985e4f1
fix: calculate operating cost based on BOM Quantity (#27464) 
* fix: calculate operating cost based on BOM Quantity

* fix: added test cases
 2021-09-15 00:37:41 +05:30
Ankush Menat
fea51f4082
chore: isort 
[skip ci]
 2021-09-14 19:04:47 +05:30
marination
469bb8d977 test: Work Order Material Transfer against Job Card 
- Tests for multiple items transfer and excess transfer against JC
- Remove unused __future__ imports
- Changed Copyright year
- Sider: (js) Added space before if
 2021-09-14 16:27:39 +05:30
marination
9520215e2b feat: Handle Excess/Multiple Item Transfer against Job Card 
- Hide MR/Material Transfer buttons in JC if cancelled
- Show MR/Material transfer buttons if pending to transfer or excess transfer allowed
- Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC
- Set status to Completed in JC in case of excess transfer too
- During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead
- Job card section and excess transfer allowance checkbox in Manufacturing Settings
- Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same)
- Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError
 2021-09-14 12:33:21 +05:30
Ankush Menat
678335f8ac
fix: job card overlap unknown column jc.employee (#27403) 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests
 2021-09-09 12:24:23 +05:30
rohitwaghchaure
295020451f
fix: added delivery date filters to get sales orders in production plan (#27367) 2021-09-08 19:28:30 +05:30
Alan
81d3524d27
fix: auto complete sales order rows in production plan (#27352) 
* fix: auto complete sales order rows in production plan

* fix: sider
 2021-09-08 16:48:42 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
81eb6fde07
Merge pull request #27288 from ankush/strict_linting 
chore: cleanup linting errors and introduce strict linting checks
 2021-09-01 19:32:49 +05:30
rohitwaghchaure
2a8cd05b44
fix: production plan UX and validation message (#27278) 2021-09-01 19:16:03 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
rohitwaghchaure
e6799d78ef
fix: operation time auto set to zero (#27188) 2021-08-27 10:46:45 +05:30
Frappe PR Bot
a1737c9a0c
fix: Production Plan: load document defaults for plan items & remove name column from listview (#26584) (#27184) 
(cherry picked from commit 69d88a921273c9e0ea29d7131232686a0be7bb78)

Co-authored-by: Richard Case <64409021+casesolved-co-uk@users.noreply.github.com>
 2021-08-26 23:04:54 +05:30
Noah Jacob
422f67a4c9
refactor: update manufacturing module onboarding (#26945) 
* refactor: updated manufacturing onboarding cards

* refactor: added form tours

* refactor: updated form tours and card descriptions

* Fix: Case of description

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-26 21:40:48 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
 2021-08-26 20:43:06 +05:30
Ankush Menat
c07dce940e
fix: don't allow BOM's item code at any level of child items (#27157) 
* refactor: bom recursion checking

* fix: dont allow bom recursion

if same item_code is added in child items at any level, it shouldn't be allowed.

* test: add test for bom recursion

* test: fix broken prodplan test using recursive bom

* test: fix recursive bom in tests
 2021-08-26 18:33:42 +05:30
18alantom
b389b8c3ad fix: prevent over riding scrap table values, name kwargs, set currency 2021-08-26 13:15:57 +05:30
18alantom
e20d21924c Merge branch 'develop' into feat-bom-process-loss-fp 2021-08-26 13:05:59 +05:30
rohitwaghchaure
ad45ddcabe
fix: sequence of sub-operations in job card (#27138) 2021-08-25 20:07:18 +05:30
18alantom
95a2565d86 fix: correct value in test 2021-08-24 20:18:53 +05:30
18alantom
aff9aee29c Merge branch 'develop' into feat-bom-process-loss-fp 2021-08-24 20:15:51 +05:30
18alantom
c3ce3f918d fix: remove spurious function 'toggle_operations' 2021-08-24 20:15:19 +05:30
18alantom
8f73d587f9 feat: process loss report, fix set pl query condition 2021-08-24 18:38:23 +05:30
18alantom
b58853e89d feat: add procss_loss_qty field in work order 2021-08-24 16:11:29 +05:30
18alantom
7fb08173b5 fix: reword error messages, fix test values 2021-08-24 15:01:38 +05:30
rohitwaghchaure
6106a635f8
Merge branch 'develop' into fix-scrap-items-updation 2021-08-24 12:10:04 +05:30
Alan
62c590261c
refactor: rectify typo (#27057) 
[skip ci]
 2021-08-20 18:21:09 +05:30
18alantom
6ef16ee4fb fix: update scrap table item details; typo 2021-08-20 12:24:13 +05:30
Noah Jacob
f13315809e
refactor: renamed varint_item_code to variant_item_code (#27025) 2021-08-19 20:28:30 +05:30
Alan
9225f02599
fix: pass planned start date to created work order (#27031) 
* fix: pass planned start date to created workorder

* test: production plan to work order start date

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-19 18:49:20 +05:30
Alan
09f34e558e
fix: set production plan to completed even on over production (#27027) 2021-08-19 15:51:36 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
18alantom
cc177f3415 fix: wo tests, sider, account for pl in se validation 2021-08-17 16:49:00 +05:30
18alantom
2670adc0c0 test: check manufacture completion qty in se and wo 2021-08-17 16:40:44 +05:30
18alantom
ad73d3fbfb refactor: validation error message formatting 2021-08-17 16:40:16 +05:30
18alantom
23ef51a981 fix: sider 2021-08-17 16:40:05 +05:30
18alantom
47a4a3d888 refactor: polyfill ?? 2021-08-17 16:39:05 +05:30
18alantom
55acb2e843 fix: sider 2021-08-17 16:37:34 +05:30
18alantom
cdf253aeb4 fix: add more validations, remove source wh req for pl item 2021-08-17 16:36:32 +05:30
18alantom
8ecb146231 test: add bom tests for process loss val, add se test for qty calc 2021-08-17 16:36:24 +05:30
18alantom
7433b97106 refactor: shift auto entry of is process loss check, update validations 2021-08-17 16:35:16 +05:30
18alantom
984c97ed4e feat: add is process loss autoset and validation 2021-08-17 16:28:54 +05:30
18alantom
b6dc0efa27 feat: add provision for process loss in manufac 2021-08-17 16:23:19 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30