-
Notifications
You must be signed in to change notification settings - Fork 85
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.
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
OP-1199 OP-1200 Pharmacy Inventory feature #2127
base: develop
Are you sure you want to change the base?
Conversation
* start with update issue * update src/main/java/org/isf/medicalinventory/gui/InventoryBrowser.java * start with update inventory * add method to update medical inventory * use the good Message Dialog * update bundle/language_en.properties * apply changes * update src/main/java/org/isf/medicalinventory/gui/InventoryBrowser.java * add possibility to view inventory * update bundle/language_en.properties * update inventory: apply check if is AUTOMATICLOT_IN is set to yes before save * remove .dist file * update .gitignore * revert .dist file * hidden column Lot code when AUTOMATICLOT_IN is set to yes and Prise column when LOTWITHCOST is set to no * restore MovStockMultipleDischarging.java * fix null pointer exception * add new field' * fix bug * update InventoryEdit.java * add posibility to add many medical * remove .factorypath * add logic of view button * add check of same lot for same medical * add posibility to delete multiple inventory row * fix error index out of bounds * update delete Inventory row * update variable name * update action to edit due date * add method to generate lot code * remove method generateLotCode() * update InventoryEdit * add new column and button to store lot informations * add logic on lot button * add status in inventory row form * fix index out of bound exception * add all products in inventoryrow * OP-1278 resource bundle addition (#2015) * update InventoryEdit.java * update InventoryEdit.java * fix error on bundle file * Chore: update Intellij settings to match Eclipse (#2019) * update InventoryEdit.java * Hibernate renamed org.hibernate.type to org.hibernate.orm.jdbc.bind (#2021) * fix bug * add validation on close button * add listener on comboBox of supplier, destination, charge, discharge * update InventoryEdit.java * fix bug related to close button * fixed bug on InventoryEdit and InventoryBrowser * update InventoryEdit.java * update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java * fix the check of inventory properties during update mode * change the method that fetch lot * disable futur date on calendar * update InventoryEdit.java * update bundle * remove InventoryStatus and Inventory type to medicalinventory package and update methods * use MainStoreQuantity instead of OverAllQuantity in inventory row * hidden total prise when LOTWITHCOST=no * remove useless code * update InventoryEdit * use only on try block in save button * fix nullpointeur exception and error data has been update by someonelse * fix error * fix error after pull * update InventoryEdit.java --------- Co-authored-by: ArnaudFonzam <[email protected]> Co-authored-by: David B Malkovsky <[email protected]> Co-authored-by: Alessandro Domanico <[email protected]>
OP-1199-Main-Store-Inventory
* fixed one bug
Align OP-1199 with develop
OP-1303 Fix layout
Co-authored-by: Alessandro Domanico <[email protected]>
OP-1303 | Make status more evident in edit inventory
* add logic to delete inventory * add import * extract inventory.getStatus() * set status on UpperCamel case when create new Inventory * Update src/main/java/org/isf/medicalinventory/gui/InventoryBrowser.java * add missiong bundle --------- Co-authored-by: ArnaudFonzam <[email protected]> Co-authored-by: Alessandro Domanico <[email protected]>
Align with develop
OP-1302 | Make JTable sortable in edit inventory
Merge develop
Align with develop
* add validate action * Update bundle/language_en.properties * update logique and apply the new * update src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java * update bundle to add new message * Rename one field * Remove useless field and format code * Remove deprecated field * Fix exception after focus out on real qty * Update one label * update logic of validate Inventory * update InventoryEdit * update validate method * update InventoryEdit * update validate inventory' * update Inventory Edit * update InventoryEdit.java * git fix error Index out of bound * update Inventory * apply suggestion * fix error on update Cost of lot * OP-1344: dialog method takes bundle key and not the final text (#2060) * Add bundles * Refactor validation method and change errors severity * create new inventory during validation phase if we have new charge movement created after the creation date of inventory --------- Co-authored-by: ArnaudFonzam <[email protected]> Co-authored-by: David B Malkovsky <[email protected]> Co-authored-by: Alessandro Domanico <[email protected]>
src/main/java/org/isf/medicalinventory/gui/InventoryWardBrowser.java
Outdated
Show resolved
Hide resolved
src/main/java/org/isf/medicalinventory/gui/InventoryBrowser.java
Outdated
Show resolved
Hide resolved
Co-authored-by: FOFOU FONZAM Gui Arnaud <[email protected]>
For me if we move those two buttons inside the other three it is not good we will have many intermediaire window when user just need to do and inventory. please Have you see that ward Inventory button don't have shortcut. may be the problem is that the Shortcut used is already use on this window. I think we should update the menu item row related to ward inventory button to set the non used shortcut. WDYT? |
Done, and also inverted item order, see informatici/openhospital-core#1474. Thanks! |
True, but in this way we have a lot of code duplication so when you want to change something you have to do it in two places. On the other hand, you have that the inventory is not a so frequent operation (generally yearly, hopefully quarterly, rarely monthly). |
See OP-1199 and OP-1200 (also addresses OP-1332).