Skip to content

OBPIH-7184 keep 0 qty requisition items #5570

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

Merged
ewaterman merged 2 commits into from
Oct 28, 2025
Merged

OBPIH-7184 keep 0 qty requisition items #5570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0edd021
OBPIH-7184 keep needed qty=0 requisition items when saving
ewaterman Oct 24, 2025
6c7336e
remove comment
ewaterman Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions grails-app/services/org/pih/warehouse/inventory/StockMovementService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2481,30 +2481,23 @@ class StockMovementService {
requisitionItem.quantityCounted = stockMovementItem.quantityCounted
removeShipmentAndPicklistItemsForModifiedRequisitionItem(requisitionItem)

if (!stockMovementItem.quantityRequested) {
log.info "Item deleted " + requisitionItem.id
if (stockMovementItem.quantityRequested != requisitionItem.quantity) {
requisitionItem.undoChanges()
requisition.removeFromRequisitionItems(requisitionItem)
requisitionItem.delete(flush: true)
} else {
if (stockMovementItem.quantityRequested != requisitionItem.quantity) {
requisitionItem.undoChanges()
}
}

requisitionItem.quantity = stockMovementItem.quantityRequested
requisitionItem.quantityApproved = stockMovementItem.quantityRequested
requisitionItem.quantity = stockMovementItem.quantityRequested
requisitionItem.quantityApproved = stockMovementItem.quantityRequested

if (stockMovementItem.product) requisitionItem.product = stockMovementItem.product
if (stockMovementItem.inventoryItem) requisitionItem.inventoryItem = stockMovementItem.inventoryItem
if (stockMovementItem.sortOrder) requisitionItem.orderIndex = stockMovementItem.sortOrder
if (stockMovementItem.product) requisitionItem.product = stockMovementItem.product
if (stockMovementItem.inventoryItem) requisitionItem.inventoryItem = stockMovementItem.inventoryItem
if (stockMovementItem.sortOrder) requisitionItem.orderIndex = stockMovementItem.sortOrder

requisitionItem.recipient = stockMovementItem.recipient
requisitionItem.palletName = stockMovementItem.palletName
requisitionItem.boxName = stockMovementItem.boxName
requisitionItem.lotNumber = stockMovementItem.lotNumber
requisitionItem.expirationDate = stockMovementItem.expirationDate
requisitionItem.comment = stockMovementItem.comments
}
requisitionItem.recipient = stockMovementItem.recipient
requisitionItem.palletName = stockMovementItem.palletName
requisitionItem.boxName = stockMovementItem.boxName
requisitionItem.lotNumber = stockMovementItem.lotNumber
requisitionItem.expirationDate = stockMovementItem.expirationDate
requisitionItem.comment = stockMovementItem.comments
}
// Otherwise we create a new one
else {
Expand Down
19 changes: 6 additions & 13 deletions src/js/components/stock-movement-wizard/request/AddItemsPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,15 +1010,10 @@ class AddItemsPage extends Component {
confirmSave(onConfirm) {
confirmAlert({
title: this.props.translate('react.stockMovement.message.confirmSave.label', 'Confirm save'),
message: this.state.isRequestFromWard
? this.props.translate(
'react.stockMovement.QOHWillNotBeSaved.message',
'If there are any empty or zero quantity lines, those lines will be deleted. Are you sure you want to proceed?',
)
: this.props.translate(
'react.stockMovement.confirmSave.message',
'Are you sure you want to save? There are some lines with empty or zero quantity, those lines will be deleted.',
),
message: this.props.translate(
'react.stockMovement.QOHWillNotBeSaved.message',
'If there are any empty or zero quantity lines, those lines will be deleted. Are you sure you want to proceed?',
),
buttons: [
{
label: this.props.translate('react.default.yes.label', 'Yes'),
Expand Down Expand Up @@ -1278,8 +1273,7 @@ class AddItemsPage extends Component {
*/
save(formValues) {
const lineItems = _.filter(formValues.lineItems, (item) => !_.isEmpty(item));
const zeroedLines = _.some(lineItems, (item) => !item.quantityRequested || item.quantityRequested === '0');
if (zeroedLines || this.state.isRequestFromWard) {
if (this.state.isRequestFromWard) {
Comment on lines -1281 to +1276
Copy link
Collaborator

@SebastianLib SebastianLib Oct 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Are you sure we don’t need to do the same thing in Create Outbound? When we use the stocklist, we also have the needed qty 🤔

image

Copy link
Member Author

@ewaterman ewaterman Oct 27, 2025

Choose a reason for hiding this comment

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

confirmed in standup that we only need this change in requisitions

this.confirmSave(() => this.saveItems(lineItems));
} else {
this.saveItems(lineItems);
Expand Down Expand Up @@ -1508,8 +1502,7 @@ class AddItemsPage extends Component {
};
if (!invalid) {
const lineItems = _.filter(values.lineItems, (item) => !_.isEmpty(item));
const zeroedLines = _.some(lineItems, (item) => !item.quantityRequested || item.quantityRequested === '0');
if (zeroedLines || this.state.isRequestFromWard) {
if (this.state.isRequestFromWard) {
this.confirmSave(() => {
saveAndRedirect(lineItems);
});
Expand Down