-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
shipment in transit update shipment status shipment entry and status handling fix duplication of lot's line in the entry receipt fix ordering in the receipt starting shipment registry Handling search modal Handle save grid state Export to pdf, csv and excel the shipments report Create and update shipment packing list fix client routing 403 error Handle status updates Handle shipment overview Enhance shipment overview and removing current_depot references Shipment barcode Fix unit and ui Do not allow affected assets do not restrict to only asset but reduce quantity of affected lot Add link to reference fix quantity reduction on edit shipment remove not necessary shipment routes Shipment exit from stock exit module shipment database structure shipment in transit update shipment status shipment entry and status handling Handling search modal Export to pdf, csv and excel the shipments report fix client routing 403 error Handle status updates Handle shipment overview Enhance shipment overview and removing current_depot references Shipment barcode fix quantity reduction on edit shipment remove not necessary shipment routes fix entry shipment reference and apply exit refactoring force block on shipment data not loaded correctly fix server side queries and schema allow deletion of ready shipment Wait for async process finished Add integration test Forbid expired lot Fixes according reviews Add shipment information in the stock entry modal for transfer Use of created_at date
- Loading branch information
1 parent
d171c5a
commit e9bcb65
Showing
68 changed files
with
4,347 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "ASSET" : { | ||
| "TITLE" : "Asset", | ||
| "STATUS" : { | ||
| "EMPTY" : "Empty", | ||
| "PARTIAL" : "Partial", | ||
| "COMPLETE" : "Complete", | ||
| "IN_TRANSIT" : "In Transit", | ||
| "DELIVERED" : "Delivered", | ||
| "AT_DEPOT" : "At Depot", | ||
| "READY_FOR_SHIPMENT" : "Ready for shipment", | ||
| "LOST" : "LOST" | ||
| }, | ||
| "CONDITION" : { | ||
| "NEW" : "New", | ||
| "GOOD" : "Good", | ||
| "BROKEN" : "Broken" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| { | ||
| "SHIPMENT" : { | ||
| "TITLE" : "Shipment", | ||
| "SHIPMENTS": "Shipments", | ||
| "SHIPMENT_REFERENCE": "Shipment Reference", | ||
| "SHIPMENT_DATE": "Expedition", | ||
| "SHIPPER": "Shipper", | ||
| "REQUISITION": "Requisition", | ||
| "ORIGIN_DEPOT": "Origin depot", | ||
| "CURRENT_DEPOT": "Current depot", | ||
| "CURRENT_LOCATION": "Current location", | ||
| "DESTINATION_DEPOT": "Destination depot", | ||
| "DATE_PACKED": "Date packed", | ||
| "DATE_SENT": "Date sent", | ||
| "DATE_DELIVERED": "Date delivered", | ||
| "ANTICIPATED_DELIVERY_DATE": "Anticipated delivery date", | ||
| "RECEIVER": "Receiver", | ||
| "CREATED_BY": "Created by", | ||
| "CREATE": "Create", | ||
| "EDIT": "Edit", | ||
| "DELETE": "Delete", | ||
| "REFERENCE": "Reference", | ||
| "STOCK_REFERENCE": "Stock Reference", | ||
| "PACKING": "Packing", | ||
| "PACKING_LIST": "Packing List", | ||
| "NEW_SHIPMENT": "New Shipment", | ||
| "SHIPMENT_REGISTRY": "Shipment Registry", | ||
| "UPDATE_LOCATION": "Update Location", | ||
| "UPDATE_LOCATION_MESSAGE": "You are about to change the location of this shipment, this information will be saved in the history of this shipment", | ||
| "UPDATE_LOCATION_WARNING": "You cannot change the location because only shipments with an IN-TRANSIT status can allow the change of location", | ||
| "UPDATE_STATUS": "Update Status", | ||
| "UPDATE_PACKING_LIST": "Update Packing List", | ||
| "READY_TO_SHIP": "Ready to ship", | ||
| "READY_TO_SHIP_MESSAGE":"By validating, you confirm that this shipment is ready to leave the warehouse; You will no longer be able to make changes to it.", | ||
| "OVERVIEW": "Shipment Overview", | ||
| "CONDITION": "Condition", | ||
| "CREATED": "Shipment successfully created", | ||
| "UPDATED": "Shipment successfully updated", | ||
| "DELETED": "Shipment successfully deleted", | ||
| "NOT_DEFINED": "Not Defined", | ||
| "NEW_LOCATION": "New Location", | ||
| "SHIPMENT_STATUS": "Shipment Status", | ||
| "SHIPMENT_LOCATION_TRACKING": "Locations Tracking", | ||
| "LOCATION": "Location", | ||
| "TRACKING_LOG": "Tracking Log", | ||
| "UPDATE_TRACKING_LOG_WARNING": "You cannot update the tracking log, as only shipments with IN-TRANSIT status can be updated", | ||
| "UPDATE_TRACKING_LOG_MESSAGE": "Please provide current shipping location and other important new information", | ||
| "CURRENT_STATUS": "Current status", | ||
| "BARCODE": "Shipment Barcode", | ||
| "ENTER_SHIPMENT_PROGRESS": "Please enter the shipment progress status", | ||
| "ENTER_SHIPMENT_PROGRESS_HELP_TEXT": "Ex. RECEPTION - IMA GOMA WAREHOUSE, GOMA", | ||
| "DELIVERY_EXPECTED_ON": "Delivery expected on", | ||
| "EXISTING_SHIPMENT_AT_DEPOT": "Current shipment in the depot ({{number}})", | ||
| "PLEASE_SHIP_EXISTING_SHIPMENT": "Please ship or cancel these existing shipments", | ||
| "EXISTING_ASSETS_IN_OTHER_SHIPMENT": "You have the following assets in ongoing shipments. Please send or cancel these shipments so that you can reassign those assets", | ||
| "DOES_SHIPMENT_EXIST": "Do you have a ready shipment?", | ||
| "DOES_SHIPMENT_EXIST_HELP": "Please provide the reference of a ready shipment", | ||
| "IS_IN_TRANSIT_TOOLTIP": "This inventory is in transit to the depot ({{depot}})" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "ASSET" : { | ||
| "TITLE" : "Actif", | ||
| "STATUS" : { | ||
| "EMPTY" : "Vide", | ||
| "PARTIAL" : "En partie", | ||
| "COMPLETE" : "Complète", | ||
| "IN_TRANSIT" : "En transit", | ||
| "DELIVERED" : "Livré", | ||
| "AT_DEPOT" : "Au dépôt", | ||
| "READY_FOR_SHIPMENT" : "Prêt pour l'expédition", | ||
| "LOST" : "Perdu" | ||
| }, | ||
| "CONDITION" : { | ||
| "NEW" : "Neuf", | ||
| "GOOD" : "Bon", | ||
| "BROKEN" : "Abimé" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| { | ||
| "SHIPMENT" : { | ||
| "TITLE" : "Expedition", | ||
| "SHIPMENTS": "Expéditions", | ||
| "SHIPMENT_REFERENCE": "Référence Expédition", | ||
| "SHIPMENT_DATE": "Date de l'expédition", | ||
| "SHIPPER": "Transporteur", | ||
| "REQUISITION": "Requisition", | ||
| "ORIGIN_DEPOT": "Dépôt d'origine", | ||
| "CURRENT_DEPOT": "Dépôt en cours", | ||
| "CURRENT_LOCATION": "Localisation en cours", | ||
| "DESTINATION_DEPOT": "Dépôt de destination", | ||
| "DATE_PACKED": "Date colisage", | ||
| "DATE_SENT": "Date d'envoi", | ||
| "DATE_DELIVERED": "Date de livraison", | ||
| "ANTICIPATED_DELIVERY_DATE": "Date de livraison previsionnelle", | ||
| "RECEIVER": "Recepteur", | ||
| "CREATED_BY": "Crée par", | ||
| "CREATE": "Créer", | ||
| "EDIT": "Editer", | ||
| "DELETE": "Supprimer", | ||
| "REFERENCE": "Reférence", | ||
| "STOCK_REFERENCE": "Stock Reférence", | ||
| "PACKING": "Colisage", | ||
| "PACKING_LIST": "Liste de colisage", | ||
| "NEW_SHIPMENT": "Nouvelle expédition", | ||
| "SHIPMENT_REGISTRY": "Registre des expéditions", | ||
| "UPDATE_LOCATION": "Mise à jour localisation", | ||
| "UPDATE_LOCATION_MESSAGE": "Vous êtes sur le point de changer la localisation de cette expédition, cette information sera enregistrée dans l'historique de cette expédition", | ||
| "UPDATE_LOCATION_WARNING": "Vous ne pouvez pas changer la localisation car seul les expéditions ayant un statut EN-TRANSIT peuvent bénéficier du changement de localisation", | ||
| "UPDATE_STATUS": "Mise à jour statut", | ||
| "UPDATE_PACKING_LIST": "Mise à jour colisage", | ||
| "READY_TO_SHIP": "Prêt pour l'expédition", | ||
| "READY_TO_SHIP_MESSAGE": "En validant, vous confirmez que cette expédition est prête pour la sortie du dépôt; Vous ne pourrez plus y effectuer des changements", | ||
| "OVERVIEW": "Aperçu de l'expédition", | ||
| "CONDITION": "Condition", | ||
| "CREATED": "Expédition créee avec succès", | ||
| "UPDATED": "Expédition mis à jour avec succès", | ||
| "DELETED": "Expédition supprimée avec succès", | ||
| "NOT_DEFINED": "Non-défini", | ||
| "NEW_LOCATION": "Nouvelle localisation", | ||
| "SHIPMENT_STATUS": "Etat de l'expédition", | ||
| "SHIPMENT_LOCATION_TRACKING": "Suivi des emplacements", | ||
| "LOCATION": "Localisation", | ||
| "TRACKING_LOG": "Journal de suivi", | ||
| "UPDATE_TRACKING_LOG_WARNING": "Vous ne pouvez pas mettre à jour le journal de suivi, car seule les expéditions ayant un statut EN-TRANSIT peuvent être mise à jour", | ||
| "UPDATE_TRACKING_LOG_MESSAGE": "Veuillez préciser la localisation actuelle de l'expédition et d'autres nouvelles informations importantes", | ||
| "CURRENT_STATUS": "Etat actuel", | ||
| "BARCODE": "Code-barre de l'expédition", | ||
| "ENTER_SHIPMENT_PROGRESS": "Veuillez entrer l'etat de progression de l'expédition", | ||
| "ENTER_SHIPMENT_PROGRESS_HELP_TEXT": "Ex. RECEPTION - IMA GOMA WAREHOUSE, GOMA", | ||
| "DELIVERY_EXPECTED_ON": "Livraison attendue le", | ||
| "EXISTING_SHIPMENT_AT_DEPOT": "Les expéditions en cours dans le dépôt ({{number}})", | ||
| "PLEASE_SHIP_EXISTING_SHIPMENT": "Veuillez envoyer ou annuler les expéditions existantes encore dans le dépôt", | ||
| "EXISTING_ASSETS_IN_OTHER_SHIPMENT": "Vous avez les actifs suivants dans des expéditions en cours. Veuillez envoyer ou annuler ces expéditions afin de pouvoir re-affecter ces actifs", | ||
| "DOES_SHIPMENT_EXIST": "Avez-vous une expédition prête ?", | ||
| "DOES_SHIPMENT_EXIST_HELP": "Veuillez renseigner la référence de l'expédition prête", | ||
| "IS_IN_TRANSIT_TOOLTIP": "Cet inventaire est en transit vers le depot ({{depot}})" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
client/src/js/components/bhHasShipmentVoucher/bhHasShipmentVoucher.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <ng-form name="HasShipmentForm"> | ||
| <bh-yes-no-radios | ||
| label="SHIPMENT.DOES_SHIPMENT_EXIST" | ||
| value="$ctrl.shipmentVoucherExist" | ||
| name="shipmentVoucherExist" | ||
| id="shipmentVoucherExist" | ||
| help-text="SHIPMENT.DOES_SHIPMENT_EXIST_HELP" | ||
| on-change-callback="$ctrl.onChangeVoucherExist(value)"> | ||
| </bh-yes-no-radios> | ||
|
|
||
| <!-- reference --> | ||
| <div class="form-group" ng-if="$ctrl.shipmentVoucherExist"> | ||
| <!-- Shipment --> | ||
| <bh-shipment-select | ||
| shipment-uuid="$ctrl.shipmentReference" | ||
| depot-uuid="$ctrl.depotUuid" | ||
| required="true" | ||
| ready="true" | ||
| disabled="$ctrl.shipmentDisabled" | ||
| on-select-callback="$ctrl.onSelectShipment(shipment)"> | ||
| </bh-shipment-select> | ||
|
|
||
| <div class="help-block" ng-show="$ctrl.message"> | ||
| <p ng-class="$ctrl.classeLabel" translate>{{ $ctrl.message }}</p> | ||
| </div> | ||
| </div> | ||
| </ng-form> |
Oops, something went wrong.