Skip to content

Master#92

Open
ktliu135 wants to merge 363 commits into
ktliu135/issue9from
master
Open

Master#92
ktliu135 wants to merge 363 commits into
ktliu135/issue9from
master

Conversation

@ktliu135
Copy link
Copy Markdown
Contributor

asset management

Copy link
Copy Markdown
Contributor Author

@ktliu135 ktliu135 left a comment

Choose a reason for hiding this comment

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

new asset management module - needs fixing

poryduckZ and others added 9 commits September 23, 2022 13:31
* fix: batch allocation

* chore: uncomented and fixed imports

* feat: added follow up line items logic

* feat: data init for warehouse and bin
* refactor: file casing fix

* feat: added more scripts for development and set ports 4200 for site-main and 4201 for site-admin

* fix: fixed runtime error upon viewing newly created PO + other fixes

* refactor: comment out console logs

* feat: added breadcrumbs for navigation between procurement ordering modules

* feat: integrated react-router-dom Link with MUI Link
* Commit to merge good receipt backend fix

* Checkout to local master branch

* fix/Corrected minor typos

* fix/Corrected minor typos

* fix/Changed image for bin card
* Commit to merge good receipt backend fix

* Checkout to local master branch

* fix/Corrected minor typos

* fix/Corrected minor typos

* fix/Changed image for bin card

* feat/QA Checklist filtered by organisation
* feat: added relation loading for bom for final goods service and other minor changes

* fix: fixed 404 page and imported static image

* feat: added BOM routes and sidebar link, initialised BOM page

* feat: added api calls to query by orgId

* refactor: moved toolbar file location

* fix: prevent calling of update api if price does not change

* fix: backend fixes and changes

* feat: added create and update dialog for BOM

* fix: fixed bug when clearing final good field

* refactor: removed unnecessary sidebar links
Copy link
Copy Markdown
Contributor Author

@ktliu135 ktliu135 left a comment

Choose a reason for hiding this comment

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

added asset management

ktliu135 and others added 18 commits September 25, 2022 21:58
* Master

* Master
asset management

* Master
asset management

* added production order entities

Co-authored-by: Kathy <ktliu135@gmail.com>
* refactor: fixed comments in BOM page

* feat: setup for ProductionOrder page and create dialog

* refactor: moved bom helper to 'helpers/production'

* feat: init production-order helper
* feat: added some display of final good information for BOM related UI

* fix: reverted incorrect quantity changes and added some UI changes
* feat/Added expiry date for batch line items, responsive dialog for create good receipt.

* Commit to merge

* Commit to change branch

* feat/Changed warehouse to bin navigation and side menu layout

* feat/Separate page for bin details

* Commit to merge

* Merged with master

* fix/Added helmet async for production order
* fix: added quantity validation for in-line editing

* feat: production order dialog changes
* feat/Added expiry date for batch line items, responsive dialog for create good receipt.

* Commit to merge

* Commit to change branch

* feat/Changed warehouse to bin navigation and side menu layout

* feat/Separate page for bin details

* Commit to merge

* Merged with master

* fix/Added helmet async for production order

* fix/Bin details page null exception, side bar converted to accordion
Bennyphoe and others added 30 commits November 13, 2022 21:47
* fix: fixed image as base64 and daily picking list

* fix: fixed rack test

* feat: added unit tests
* Switching to master

* feat/Bulk discount and org profile

* Commit to merge

* Changing branch

* Abandoned, image uploading
* Changing branch

* feat/Retailer invoice mark as paid, demand forecast features

* Commit to switch branch
* delete sensor entity

* new data init
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants