Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test alternative workstation #80

Merged
merged 7 commits into from
May 29, 2024
Merged

Test alternative workstation #80

merged 7 commits into from
May 29, 2024

Conversation

agritheory
Copy link
Owner

@agritheory agritheory commented May 13, 2024 •
edited
Loading

#60

@agritheory agritheory marked this pull request as draft May 13, 2024 20:12
@agritheory agritheory requested a review from MyuddinKhatri May 13, 2024 20:12
@agritheory
Copy link
Owner Author

Test for switching job cards will be added to the issue_59 branch

@agritheory agritheory marked this pull request as ready for review May 13, 2024 21:07
@agritheory agritheory requested review from HKuz and removed request for MyuddinKhatri May 27, 2024 17:59
HKuz
HKuz requested changes May 28, 2024
View reviewed changes
Copy link
Collaborator

@HKuz HKuz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One query error came up when I had the feature turned off - see comments on workstation.py.

@HKuz
Copy link
Collaborator

HKuz commented May 29, 2024

Updated query code as discussed (pops filters before running execute). I also ran into a flake8 pre-commit error about backticks being deprecated (error W604), I added it to the .flake8 file to ignore but let me know if I should use the #noqa: W604 syntax inline instead.

Also, looks like we have our first track overrides warning - should I update for that in this PR or do that separately?

@agritheory
Copy link
Owner Author

@HKuz Go ahead and evaluate the override warning.

@HKuz
Copy link
Collaborator

HKuz commented May 29, 2024

@agritheory all good - latest erpnext changes in the commit didn't touch the method we're overriding. I merged in v-14 and made the update.

@agritheory agritheory merged commit e8f300f into version-14 May 29, 2024
7 checks passed
@agritheory agritheory deleted the test_alternative_workstation branch May 29, 2024 17:42
Alchez pushed a commit that referenced this pull request May 30, 2024
@agritheory @HKuz
Test alternative workstation (#80)
4c81808 
* test: add test for alternative workstation

* feat: make alternative workstations configurable

* fix: uncomment js code for testing

* feat: search alternative workstation names

* refactor: pop filters that cause error for Workstation

* chore: update override commit hash

---------

Co-authored-by: Heather Kusmierz <[email protected]>
@Alchez Alchez mentioned this pull request May 30, 2024
Merged
agritheory added a commit that referenced this pull request Jun 4, 2024
@agritheory @HKuz
Test alternative workstation (#80)
ef0410a 
* test: add test for alternative workstation

* feat: make alternative workstations configurable

* fix: uncomment js code for testing

* feat: search alternative workstation names

* refactor: pop filters that cause error for Workstation

* chore: update override commit hash

---------

Co-authored-by: Heather Kusmierz <[email protected]>
agritheory added a commit that referenced this pull request Jul 13, 2024
@agritheory @HKuz
Test alternative workstation (#80)
6ec2a91 
* test: add test for alternative workstation

* feat: make alternative workstations configurable

* fix: uncomment js code for testing

* feat: search alternative workstation names

* refactor: pop filters that cause error for Workstation

* chore: update override commit hash

---------

Co-authored-by: Heather Kusmierz <[email protected]>
agritheory added a commit that referenced this pull request Jul 24, 2024
@Alchez @agritheory @HKuz
Test alternative workstation (#80) (#93)
bcaaa64 
* test: add test for alternative workstation

* feat: make alternative workstations configurable

* fix: uncomment js code for testing

* feat: search alternative workstation names

* refactor: pop filters that cause error for Workstation

* chore: update override commit hash

---------

Co-authored-by: Tyler Matteson <[email protected]>
Co-authored-by: Heather Kusmierz <[email protected]>
Co-authored-by: Rohan Bansal <[email protected]>
agritheory added a commit that referenced this pull request Aug 7, 2024
@agritheory @HKuz
@Alchez @fproldan
Fix multi-company PO aggregation workflow frontend (#82)
3515504 
* wip: fix multi-company PO aggregation workflow frontend

* wip: purchase receipt generation

* test: test downstream effects of partial PO aggregation

* ci: track overrides for purchase cycle (PO/PI/PR) (#89)

* ci: track overrides for stock and manufacturing cycles (#90)

Co-authored-by: Rohan Bansal <[email protected]>

* Test alternative workstation (#80)

* test: add test for alternative workstation

* feat: make alternative workstations configurable

* fix: uncomment js code for testing

* feat: search alternative workstation names

* refactor: pop filters that cause error for Workstation

* chore: update override commit hash

---------

Co-authored-by: Heather Kusmierz <[email protected]>

* fix: rm unused variable

* fix: frappe.boot.inventory_tools_settings

* chore: track overrides

---------

Co-authored-by: Heather Kusmierz <[email protected]>
Co-authored-by: Rohan <[email protected]>
Co-authored-by: Rohan Bansal <[email protected]>
Co-authored-by: fproldan <[email protected]>
agritheory added a commit that referenced this pull request Aug 12, 2024
@agritheory @HKuz
@Alchez @bhattdevarsh
Faceted search (#44)
398d970 
* feat: add inventory tools settings to boot (#81)

* 14.6.0

Automatically generated by python-semantic-release

* ci: track overrides for purchase cycle (PO/PI/PR) (#89)

* ci: track overrides for stock and manufacturing cycles (#90)

Co-authored-by: Rohan Bansal <[email protected]>

* Test alternative workstation (#80)

* test: add test for alternative workstation

* feat: make alternative workstations configurable

* fix: uncomment js code for testing

* feat: search alternative workstation names

* refactor: pop filters that cause error for Workstation

* chore: update override commit hash

---------

Co-authored-by: Heather Kusmierz <[email protected]>

* wip: doctypes and vue setup

* wip: specification upload initerface

* wip: basic filters rendering + test setup

* wip: faceted search - specification editing report

* feat: add loader for specification and listview filters

* wip: all-products + "Fruits" filter working

* wip: set filter values in ranged filter

* chore: remove commented import

* wip: serialize dates as epoch time

* wip: sort order

* feat: facted search in listview also

* feat: color picker

also test fixtures fixes and csrf token fix (frappe.ready)

* feat: color picker background, date bugfix

* refactor: filters UX under all-product page

* fix: field validations on specification attribute child

* feat: collapsable filters for all-product page

* docs: faceted search functionality

* docs: fix images

* refactor: documentation, filtering ux

* docs: correction of documentation errors

* fix: color picker deserialization

* chore: add yarn.lock file

* feat: add debounce, refactor to vue3 with build

* feat: cleanup imports, mypy fixes

* ci: install mypy and types non-interactive

* ci: use python, bench is not installed

* ci: pipe yes

* ci: use --no-input instead og piping yes

* feat: add inventory tools settings

* feat: render in listview with style conflicts

* docs: update docs

* feat: allow user to bulk create specification values from specifications

* fix: update specification value attribute(s) if user change specification attribute name(s)

* chore: pre-commit

* fix: listview filter logic

* fix: faceted search various issues

* fix: cleaner item attribute lookup

* feat: allow edit and generate of specs from Item and Spec doctypes

* test: wip tests

todo: coallate most APIs into the 'update_linked_values' method

* chore: rebase to version-15, fix tests

* chore: black / prettier

* ci: install mypy types non-interactive

* ci: install webshop

* ci: add payments

* ci: install apps fixes, move test fixtures to separate job name

* wip: faceted search fixes

- styles
- API / data creation
- tests

* feat: fix deleted value test

wrong specification

* fix: filter UX on specification dialog

* chore: black

* fix: bad hex code for color fixture

* fix: reimplement convert_to_epoch function

* fix: minor changes

* feat: use composition API for Vue components

* fix: upstream override commit hashes

* feat: obey inventory tools settings visibility

* fix: web api filters setting correctly

* fix: reset list filters when faceted search filters are reset

* fix: reset facet filters when list filters are reset

* fix: sort order functionality

---------

Co-authored-by: Heather Kusmierz <[email protected]>
Co-authored-by: Rohan <[email protected]>
Co-authored-by: Rohan Bansal <[email protected]>
Co-authored-by: Rohan Bansal <[email protected]>
Co-authored-by: Devarsh Bhatt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HKuz HKuz HKuz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@agritheory @HKuz