Skip to content

Commit

Permalink
Merge branch 'OP-1305' of https://github.com/ArnaudFofou/openhospital…
Browse files Browse the repository at this point in the history 
…-gui into OP-1305
  • Loading branch information
ArnaudFofou committed Nov 19, 2024
2 parents f002a70 + 98cd2c8 commit a424062
Show file tree
Hide file tree
Showing 9 changed files with 536 additions and 20 deletions.
11 changes: 6 additions & 5 deletions bundle/language_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ angal.hospital.visitduration.txt
angal.hospital.visitendhour.txt = Visit end hour
angal.hospital.visitstarthour.txt = Visit start hour
angal.inventory.allproduct.txt = All products
angal.inventory.askforrealquantityempty.msg = Do you want to print without the real quantity?
angal.inventory.canceled = Canceled
angal.inventory.confirm.btn = Confirm
angal.inventory.confirm.btn.key = O
Expand Down Expand Up @@ -744,11 +745,11 @@ angal.inventory.specificproduct.txt
angal.inventoryrow.theoreticqty.col = Theoretic Qty
angal.inventory.totalprice = Total price
angal.inventoryrow.unitprice.col = Unit price
angal.inventory.pleasevalidateinventoryagainsbeforeconfirmation.msg = Please validate this inventory agains before confirmation.
angal.inventory.pleasevalidateinventoryagainsbeforeconfirmation.msg = Please validate this inventory again before confirmation.
angal.inventory.update.error.msg = Inventory not updated.
angal.inventory.update.success.msg = Inventory updated.
angal.inventory.doyouwanttoupdatethisinventory.msg = Do you want to update this inventory?
angal.inventory.nothinghasbeenaddedonthisinventory.msg = Nothing has been added on this inventory.
angal.inventory.nothinghasbeenaddedonthisinventory.msg = Nothing has been added to this inventory.
angal.inventory.validated = Validated
angal.inventory.done = Done
angal.inventory.validate.btn = Validate
Expand Down Expand Up @@ -907,8 +908,8 @@ angal.medicalstock.cost.col
angal.medicalstock.deletemovementsuccess.msg = Last movement successfully deleted.
angal.medicalstock.discharge.btn = Discharge
angal.medicalstock.discharge.btn.key = R
angal.medicalstock.notpossibletodeletethismovementthemedicalhasbeenusedafterbeenreceivedinward.fmt.msg = Not possible to delete this movement: the medical {0} has already been used after been received in ward {1}.
angal.medicalstock.notpossibletodeletethismovementbecauseitisrelatedtoaninventory.msg = Not possible to delete this movement because it is related to an inventory.
angal.medicalstock.notpossibletodeletethismovementthemedicalhasbeenusedafterbeenreceivedinward.fmt.msg = Not possible to delete this movement: the medical {0} has been used after it was received in ward {1}.
angal.medicalstock.notpossibletodeletethismovementbecauseitisrelatedtoaninventory.msg = Not possible to delete this movement because it is related to an inventory.
angal.medicalstock.duedate = Due date
angal.medicalstock.duedate.col = Due Date
angal.medicalstock.duedatefromcannotbelaterthanduedateto = Due Date From cannot be later than Due Date To
Expand Down Expand Up @@ -1942,4 +1943,4 @@ angal.xmpp.userinfo.fmt.txt
angal.xmpp.usersinfo.border = User's Info
angal.xmpp.wantstosharewithyouthisreport.fmt.msg = \n*** {0} wants to share with you this report: {1}\n
angal.xmpp.wouldliketosend.fmt.msg = {0} would like to send: \n{1}
angal.xmpp.youhaverejectedthefiletransfer.txt = You have rejected the file transfer.
angal.xmpp.youhaverejectedthefiletransfer.txt = You have rejected the file transfer.
Binary file added rpt_base/Inventory.jasper
View file
Binary file not shown.
Loading

0 comments on commit a424062

Please sign in to comment.