Commit44736ed

authored

OBPIH-6887 products cant be deactivated while on a stocklist (#5557)

1 parent273efac commit44736edCopy full SHA for 44736ed

File tree

+19

-1

lines changed

grails-app
- domain/org/pih/warehouse/product
  - Product.groovy
- i18n
  - messages.properties

+19

-1

lines changed

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ import org.pih.warehouse.inventory.InventoryLevel`
`33`	`33`	`importorg.pih.warehouse.inventory.InventorySnapshotEvent`
`34`	`34`	`importorg.pih.warehouse.inventory.TransactionCode`
`35`	`35`	`importorg.pih.warehouse.inventory.TransactionEntry`
	`36`	`+importorg.pih.warehouse.requisition.RequisitionItem`
`36`	`37`	`importorg.pih.warehouse.shipping.ShipmentItem`
`37`	`38`	`importorg.pih.warehouse.LocalizationUtil`
`38`	`39`
`@@ -298,7 +299,23 @@ class Product implements Comparable, Serializable {`
`298`	`299`	`unitOfMeasure(nullable:true,maxSize:255)`
`299`	`300`	`category(nullable:false)`
`300`	`301`	`productType(nullable:false)`
`301`		`- active(nullable:true)`
	`302`	`+ active(nullable:true,validator: {value,obj->`
	`303`	`+if (value) {`
	`304`	`+returntrue`
	`305`	`+ }`
	`306`	`+// Don't allow a product to be deactivated if it is in an active stocklist.`
	`307`	`+int numActiveStocklistsForProduct=RequisitionItem.createCriteria().count {`
	`308`	`+ eq('product', obj)`
	`309`	`+ requisition {`
	`310`	`+ eq('isTemplate',true)`
	`311`	`+ eq('isPublished',true)`
	`312`	`+ }`
	`313`	`+ }`
	`314`	`+if (numActiveStocklistsForProduct>0) {`
	`315`	`+return ['invalid.inStocklist']`
	`316`	`+ }`
	`317`	`+returntrue`
	`318`	`+ })`
`302`	`319`	`coldChain(nullable:true)`
`303`	`320`	`reconditioned(nullable:true)`
`304`	`321`	`controlledSubstance(nullable:true)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2023,6 +2023,7 @@ product.preferredBin.label=Preferred bin location`
`2023`	`2023`	`product.associations.label=Associations`
`2024`	`2024`	`product.substitutions.label=Substitutions`
`2025`	`2025`	`product.active.label=Active`
	`2026`	`+product.active.invalid.inStocklist=Product cannot be deactivated because it is on a published stocklist. Go to stocklist management to see the stocklists this product is on`
`2026`	`2027`	`product.lotAndExpiryControl.label=Lot and expiry control`
`2027`	`2028`	`product.lotControl.label=Lot control`
`2028`	`2029`	`product.serialized.label=Serialized`

Comments

(0)