Index: /trunk/grails-app/controllers/InventoryItemDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 718)
+++ /trunk/grails-app/controllers/InventoryItemDetailedController.groovy (revision 719)
@@ -344,5 +344,4 @@
associatedPropertyValues.inventoryLocationList = InventoryLocation.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
associatedPropertyValues.assetList = Asset.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
- associatedPropertyValues.manufacturerList = Manufacturer.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
associatedPropertyValues.supplierList = Supplier.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
@@ -433,10 +432,8 @@
def possibleAlternateItems = inventoryItemService.getPossibleAlternateItems(result.inventoryItemInstance)
def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
- def manufacturers = Manufacturer.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
return [ inventoryItemInstance : result.inventoryItemInstance,
possibleAlternateItems: possibleAlternateItems,
- suppliers: suppliers,
- manufacturers: manufacturers]
+ suppliers: suppliers]
}
@@ -462,9 +459,7 @@
def possibleAlternateItems = inventoryItemService.getPossibleAlternateItems(result.inventoryItemInstance)
def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
- def manufacturers = Manufacturer.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
render(view:'edit', model:[inventoryItemInstance: result.inventoryItemInstance.attach(),
possibleAlternateItems: possibleAlternateItems,
- suppliers: suppliers,
- manufacturers: manufacturers])
+ suppliers: suppliers])
}
@@ -472,10 +467,8 @@
def result = inventoryItemService.create(params)
def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
- def manufacturers = Manufacturer.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
if(!result.error)
return [inventoryItemInstance: result.inventoryItemInstance,
- suppliers: suppliers,
- manufacturers: manufacturers]
+ suppliers: suppliers]
//flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
@@ -493,10 +486,8 @@
def suppliers = Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
- def manufacturers = Manufacturer.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
//flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
render(view:'create', model:[inventoryItemInstance: result.inventoryItemInstance,
- suppliers: suppliers,
- manufacturers: manufacturers])
+ suppliers: suppliers])
}
Index: /trunk/grails-app/domain/InventoryItem.groovy
===================================================================
--- /trunk/grails-app/domain/InventoryItem.groovy (revision 718)
+++ /trunk/grails-app/domain/InventoryItem.groovy (revision 719)
@@ -6,9 +6,7 @@
Picture picture
Supplier preferredSupplier
- Manufacturer preferredManufacturer
String name
String description = ""
String comment = ""
- String manufacturersPartNumber
BigDecimal estimatedUnitPriceAmount
Currency estimatedUnitPriceCurrency
@@ -28,5 +26,4 @@
spareFor: Asset,
inventoryMovements: InventoryMovement,
- alternateManufacturers: Manufacturer,
alternateSuppliers: Supplier]
@@ -49,8 +46,6 @@
inventoryGroup()
inventoryType()
- manufacturersPartNumber(blank:true, nullable:true)
suppliersPartNumber(blank:true, nullable:true)
preferredSupplier(nullable:true)
- preferredManufacturer(nullable:true)
}
Index: /trunk/grails-app/services/InventoryCsvService.groovy
===================================================================
--- /trunk/grails-app/services/InventoryCsvService.groovy (revision 718)
+++ /trunk/grails-app/services/InventoryCsvService.groovy (revision 719)
@@ -52,5 +52,5 @@
def line = []
def lineNumber = 0
- def maxNumberOfColumns = 23
+ def maxNumberOfColumns = 20
def inventoryParams = [:]
def inventoryProperties = ["name", "description", "comment", "unitsInStock", "reorderPoint", "reorderQuantity",
@@ -59,5 +59,4 @@
"inventoryGroup", "inventoryType",
"suppliersPartNumber", "preferredSupplier", "alternateSuppliers",
- "manufacturersPartNumber", "preferredManufacturer", "alternateManufacturers",
"alternateItems", "spareFor"]
@@ -69,8 +68,4 @@
def spareForInstance
def alternateItemInstance
- def preferredManufacturerInstance
- def alternateManufacturerInstance
- def manufacturerTypeInstance
- def manufacturerTypeUnknown = ManufacturerType.get(1)
def inventoryTypeInstance
def unitOfMeasureInstance
@@ -88,13 +83,4 @@
def tempSupplierType = ''
def tempSupplierItemAndType = []
-
- def tempPreferredManufacturerItemAndType = ''
- def tempPreferredManufacturerItem = ''
- def tempPreferredManufacturerType = ''
-
- def tempAlternateManufacturers = []
- def tempManufacturerItem = ''
- def tempManufacturerType = ''
- def tempManufacturerItemAndType = []
def tempSpareFor = []
@@ -238,69 +224,4 @@
return fail(code: "inventory.import.failure", args: [lineNumber, logFileLink])
}
- }
-
- // Preferred Manufacturer
- if(inventoryParams.preferredManufacturer) {
- tempPreferredManufacturerItemAndType = parseItemAndType(inventoryParams.preferredManufacturer)
- tempPreferredManufacturerItem = WordUtils.capitalize(tempPreferredManufacturerItemAndType[0])
-
- preferredManufacturerInstance = Manufacturer.findByName(tempPreferredManufacturerItem)
- if(!preferredManufacturerInstance) {
-
- // Manufacturer Type.
- if(tempPreferredManufacturerItemAndType.size == 2) {
- tempPreferredManufacturerType = WordUtils.capitalize(tempPreferredManufacturerItemAndType[1])
- manufacturerTypeInstance = ManufacturerType.findByName(tempPreferredManufacturerType)
- }
- else
- manufacturerTypeInstance = manufacturerTypeUnknown
- if(!manufacturerTypeInstance) {
- log.error "Failed to find preferred manufacturer type on line: " + lineNumber
- return fail(code: "inventory.import.failure", args: [lineNumber, logFileLink])
- }
-
- preferredManufacturerInstance = new Manufacturer(name: tempPreferredManufacturerItem,
- manufacturerType: manufacturerTypeInstance)
- if(!preferredManufacturerInstance.save()) {
- log.error "Failed to create preferred manufacturer on line: " + lineNumber
- return fail(code: "inventory.import.failure", args: [lineNumber, logFileLink])
- }
- }
- }
- else
- preferredManufacturerInstance = null
-
- // Alternate Manufacturers.
- tempAlternateManufacturers = parseInputList(inventoryParams.alternateManufacturers)
- inventoryParams.alternateManufacturers = []
-
- for(tempManufacturer in tempAlternateManufacturers) {
- tempManufacturerItemAndType = parseItemAndType(tempManufacturer)
- tempManufacturerItem = WordUtils.capitalizeFully(tempManufacturerItemAndType[0])
-
- alternateManufacturerInstance = Manufacturer.findByName(tempManufacturerItem)
- if(!alternateManufacturerInstance) {
-
- // ManufacturerType.
- if(tempManufacturerItemAndType.size == 2) {
- tempManufacturerType = WordUtils.capitalize(tempManufacturerItemAndType[1])
- manufacturerTypeInstance = ManufacturerType.findByName(tempManufacturerType)
- }
- else
- manufacturerTypeInstance = manufacturerTypeUnknown
- if(!manufacturerTypeInstance) {
- log.error "Failed to find manufacturer type on line: " + lineNumber
- return fail(code: "inventory.import.failure", args: [lineNumber, logFileLink])
- }
-
- alternateManufacturerInstance = new Manufacturer(name: tempManufacturerItem,
- manufacturerType: manufacturerTypeInstance)
- if(!alternateManufacturerInstance.save()) {
- log.error "Failed to create manufacturers on line: " + lineNumber
- return fail(code: "inventory.import.failure", args: [lineNumber, logFileLink])
- }
- }
-
- inventoryParams.alternateManufacturers.add(alternateManufacturerInstance)
}
@@ -417,5 +338,4 @@
inventoryParams.unitOfMeasure = unitOfMeasureInstance
inventoryParams.preferredSupplier = preferredSupplierInstance
- inventoryParams.preferredManufacturer = preferredManufacturerInstance
// Name.
@@ -485,5 +405,5 @@
writer.writeNext("Comment: Required columns are marked with a (*) in the header line.")
writer.writeNext("Comment: Lists of items in a column must be separated by a semicolon (;), not a comma.")
- writer.writeNext("Comment: The at symbol (@) is reserved for indicating supplier and manufacturer types.")
+ writer.writeNext("Comment: The at symbol (@) is reserved for indicating supplier types.")
writer.writeNext("Comment: Identical and existing names will be considered as the same item.")
writer.writeNext("Comment: Lines containing 'comment' will be ignored.")
@@ -515,6 +435,4 @@
"123", "Multi Supplier@Local",
"Multi Distributors1@OEM; Multi Distributors2@Local",
- "321", "Master Manufacturer@OEM",
- "Mega Manufacturer1@OEM;Mega Manufacturer2@Alternate",
"2204E-2RS", ""
] as String[])
@@ -530,6 +448,4 @@
"456KL", "Multi Supplier",
"Multi Distributors1; Multi Distributors2",
- "654OP", "Master Manufacturer",
- "Mega Manufacturer1;Mega Manufacturer2",
"", ""
] as String[])
@@ -582,19 +498,4 @@
}.collect { it.name + "@" + it.supplierType }.join(';') )
- row.add(inventoryItem.manufacturersPartNumber)
-
- if(inventoryItem.preferredManufacturer)
- row.add( inventoryItem.preferredManufacturer.name + "@" + inventoryItem.preferredManufacturer.manufacturerType )
- else
- row.add('')
-
- row.add(inventoryItem.alternateManufacturers.sort { p1, p2 ->
- p1.name.compareToIgnoreCase(p2.name)
- }.collect { it.name + "@" + it.manufacturerType }.join(';'))
-
- row.add(inventoryItem.alternateItems.sort { p1, p2 ->
- p1.name.compareToIgnoreCase(p2.name)
- }.collect { it.name }.join(';') )
-
row.add(inventoryItem.spareFor.sort { p1, p2 ->
p1.name.compareToIgnoreCase(p2.name)
@@ -813,5 +714,5 @@
"Estimated Unit Price", "Currency", "Enable Reorder", "Location*", "Store*", "Site*", "Group*", "Type*",
"Supplier's Part Number", "Preferred Supplier", "Alternate Suppliers",
- "Manufacturer's Part Number", "Preferred Manufacturer", "Alternate Manufacturers", "Alternate Item", "Spare For"]
+ "Alternate Item", "Spare For"]
}
Index: /trunk/grails-app/views/inventoryItemDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/create.gsp (revision 718)
+++ /trunk/grails-app/views/inventoryItemDetailed/create.gsp (revision 719)
@@ -169,36 +169,4 @@
-
- |
-
- |
-
-
- |
-
-
-
- |
-
- |
-
-
-
- +Add Manufacturer
- |
-
-
-
- |
-
- |
-
-
- |
-
-
Index: /trunk/grails-app/views/inventoryItemDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/edit.gsp (revision 718)
+++ /trunk/grails-app/views/inventoryItemDetailed/edit.gsp (revision 719)
@@ -207,36 +207,4 @@
|
-
- |
-
-
- |
-
-
-
- |
-
- |
-
-
-
- +Add Manufacturer
- |
-
-
-
- |
-
- |
-
-
- |
-
-
-
- |
|
Index: /trunk/grails-app/views/inventoryItemDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/search.gsp (revision 718)
+++ /trunk/grails-app/views/inventoryItemDetailed/search.gsp (revision 719)
@@ -242,10 +242,7 @@
excludeProperties="estimatedUnitPriceCurrency"
associatedProperties="inventoryLocation.name,
- spareFor.name,
- preferredManufacturer.name,
- preferredSupplier.name"
+ spareFor.name"
filterPropertyValues="${['inventoryLocation.name':[values: associatedPropertyValues.inventoryLocationList],
'spareFor.name':[values: associatedPropertyValues.assetList],
- 'preferredManufacturer.name':[values: associatedPropertyValues.manufacturerList],
'preferredSupplier.name':[values: associatedPropertyValues.supplierList]
]}"/>
Index: /trunk/grails-app/views/inventoryItemDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/show.gsp (revision 718)
+++ /trunk/grails-app/views/inventoryItemDetailed/show.gsp (revision 719)
@@ -299,32 +299,4 @@
-
- | Manufacturers Part Number: |
- ${fieldValue(bean:inventoryItemInstance, field:'manufacturersPartNumber')} |
-
-
-
- | Preferred Manufacturer: |
-
-
-
- ${inventoryItemInstance.preferredManufacturer?.encodeAsHTML()}
-
- |
-
-
-
- | Alternate Manufacturers: |
-
-
-
-
- - ${m?.encodeAsHTML()}
-
-
- |
-
-
-