Index: /trunk/grails-app/conf/Config.groovy
===================================================================
--- /trunk/grails-app/conf/Config.groovy	(revision 721)
+++ /trunk/grails-app/conf/Config.groovy	(revision 722)
@@ -270,12 +270,4 @@
         ]
     ],
-    [order:60, controller:'manufacturerDetailed', title:'manufacturer', action:'list',
-        subItems: [
-            [order:10, controller:'manufacturerDetailed', title:'Manufacturer List', action:'list', isVisible: { true }],
-            [order:20, controller:'manufacturerDetailed', title:'Create', action:'create', isVisible: { true }],
-            [order:90, controller:'manufacturerDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
-            [order:91, controller:'manufacturerDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
-        ]
-    ],
     [order:70, controller:'inventoryStoreDetailed', title:'inventoryStore', action:'list',
         subItems: [
@@ -300,12 +292,4 @@
             [order:90, controller:'inventoryGroupDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
             [order:91, controller:'inventoryGroupDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
-        ]
-    ],
-    [order:100, controller:'manufacturerTypeDetailed', title:'manufacturerType', action:'list',
-        subItems: [
-            [order:10, controller:'manufacturerTypeDetailed', title:'Manufacturer Type List', action:'list', isVisible: { true }],
-            [order:20, controller:'manufacturerTypeDetailed', title:'Create', action:'create', isVisible: { true }],
-            [order:90, controller:'manufacturerTypeDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
-            [order:91, controller:'manufacturerTypeDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
         ]
     ],
Index: unk/grails-app/controllers/ManufacturerDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/ManufacturerDetailedController.groovy	(revision 721)
+++ 	(revision )
@@ -1,110 +1,0 @@
-import org.codehaus.groovy.grails.plugins.springsecurity.Secured
-
-@Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_InventoryManager'])
-class ManufacturerDetailedController extends BaseController {
-    
-    def index = { redirect(action:list,params:params) }
-
-    // the delete, save and update actions only accept POST requests
-    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
-
-    def list = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ manufacturerInstanceList: Manufacturer.list( params ), manufacturerInstanceTotal: Manufacturer.count() ]
-    }
-
-    def show = {
-
-        // In the case of an actionSubmit button, rewrite action name from 'index'.
-        if(params._action_Show)
-            params.action='show'
-
-        def manufacturerInstance = Manufacturer.get( params.id )
-
-        if(!manufacturerInstance) {
-            flash.message = "Manufacturer not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ manufacturerInstance : manufacturerInstance ] }
-    }
-
-    def delete = {
-        def manufacturerInstance = Manufacturer.get( params.id )
-        if(manufacturerInstance) {
-            try {
-                manufacturerInstance.delete(flush:true)
-                flash.message = "Manufacturer ${params.id} deleted"
-                redirect(action:list)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "Manufacturer ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
-        }
-        else {
-            flash.message = "Manufacturer not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def edit = {
-
-        // In the case of an actionSubmit button, rewrite action name from 'index'.
-        if(params._action_Edit)
-            params.action='edit'
-
-        def manufacturerInstance = Manufacturer.get( params.id )
-
-        if(!manufacturerInstance) {
-            flash.message = "Manufacturer not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ manufacturerInstance : manufacturerInstance ]
-        }
-    }
-
-    def update = {
-        def manufacturerInstance = Manufacturer.get( params.id )
-        if(manufacturerInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(manufacturerInstance.version > version) {
-                    
-                    manufacturerInstance.errors.rejectValue("version", "default.optimistic.locking.failure")
-                    render(view:'edit',model:[manufacturerInstance:manufacturerInstance])
-                    return
-                }
-            }
-            manufacturerInstance.properties = params
-            if(!manufacturerInstance.hasErrors() && manufacturerInstance.save(flush: true)) {
-                flash.message = "Manufacturer ${params.id} updated"
-                redirect(action:show,id:manufacturerInstance.id)
-            }
-            else {
-                render(view:'edit',model:[manufacturerInstance:manufacturerInstance])
-            }
-        }
-        else {
-            flash.message = "Manufacturer not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def create = {
-        def manufacturerInstance = new Manufacturer()
-        manufacturerInstance.properties = params
-        return ['manufacturerInstance':manufacturerInstance]
-    }
-
-    def save = {
-        def manufacturerInstance = new Manufacturer(params)
-        if(!manufacturerInstance.hasErrors() && manufacturerInstance.save(flush: true)) {
-            flash.message = "Manufacturer ${manufacturerInstance.id} created"
-            redirect(action:show,id:manufacturerInstance.id)
-        }
-        else {
-            render(view:'create',model:[manufacturerInstance:manufacturerInstance])
-        }
-    }
-}
Index: unk/grails-app/controllers/ManufacturerTypeDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/ManufacturerTypeDetailedController.groovy	(revision 721)
+++ 	(revision )
@@ -1,113 +1,0 @@
-import org.codehaus.groovy.grails.plugins.springsecurity.Secured
-
-@Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager'])
-class ManufacturerTypeDetailedController extends BaseController {
-
-    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
-    def index = { redirect(action:list,params:params) }
-
-    // the delete, save and update actions only accept POST requests
-    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
-
-    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
-    def list = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ manufacturerTypeInstanceList: ManufacturerType.list( params ), manufacturerTypeInstanceTotal: ManufacturerType.count() ]
-    }
-
-    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
-    def show = {
-
-        // In the case of an actionSubmit button, rewrite action name from 'index'.
-        if(params._action_Show)
-            params.action='show'
-
-        def manufacturerTypeInstance = ManufacturerType.get( params.id )
-
-        if(!manufacturerTypeInstance) {
-            flash.message = "ManufacturerType not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ manufacturerTypeInstance : manufacturerTypeInstance ] }
-    }
-
-    def delete = {
-        def manufacturerTypeInstance = ManufacturerType.get( params.id )
-        if(manufacturerTypeInstance) {
-            try {
-                manufacturerTypeInstance.delete(flush:true)
-                flash.message = "ManufacturerType ${params.id} deleted"
-                redirect(action:list)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "ManufacturerType ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
-        }
-        else {
-            flash.message = "ManufacturerType not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def edit = {
-
-        // In the case of an actionSubmit button, rewrite action name from 'index'.
-        if(params._action_Edit)
-            params.action='edit'
-
-        def manufacturerTypeInstance = ManufacturerType.get( params.id )
-
-        if(!manufacturerTypeInstance) {
-            flash.message = "ManufacturerType not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ manufacturerTypeInstance : manufacturerTypeInstance ]
-        }
-    }
-
-    def update = {
-        def manufacturerTypeInstance = ManufacturerType.get( params.id )
-        if(manufacturerTypeInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(manufacturerTypeInstance.version > version) {
-                    
-                    manufacturerTypeInstance.errors.rejectValue("version", "default.optimistic.locking.failure")
-                    render(view:'edit',model:[manufacturerTypeInstance:manufacturerTypeInstance])
-                    return
-                }
-            }
-            manufacturerTypeInstance.properties = params
-            if(!manufacturerTypeInstance.hasErrors() && manufacturerTypeInstance.save(flush: true)) {
-                flash.message = "ManufacturerType ${params.id} updated"
-                redirect(action:show,id:manufacturerTypeInstance.id)
-            }
-            else {
-                render(view:'edit',model:[manufacturerTypeInstance:manufacturerTypeInstance])
-            }
-        }
-        else {
-            flash.message = "ManufacturerType not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def create = {
-        def manufacturerTypeInstance = new ManufacturerType()
-        manufacturerTypeInstance.properties = params
-        return ['manufacturerTypeInstance':manufacturerTypeInstance]
-    }
-
-    def save = {
-        def manufacturerTypeInstance = new ManufacturerType(params)
-        if(!manufacturerTypeInstance.hasErrors() && manufacturerTypeInstance.save(flush: true)) {
-            flash.message = "ManufacturerType ${manufacturerTypeInstance.id} created"
-            redirect(action:show,id:manufacturerTypeInstance.id)
-        }
-        else {
-            render(view:'create',model:[manufacturerTypeInstance:manufacturerTypeInstance])
-        }
-    }
-}
Index: /trunk/grails-app/domain/Address.groovy
===================================================================
--- /trunk/grails-app/domain/Address.groovy	(revision 721)
+++ /trunk/grails-app/domain/Address.groovy	(revision 722)
@@ -3,5 +3,4 @@
     AddressType addressType
 
-    Manufacturer manufacturer
     Supplier supplier
     Person person
@@ -17,5 +16,5 @@
 //     hasMany = []
 
-    static belongsTo = [Manufacturer, Supplier, Person, Site]
+    static belongsTo = [Supplier, Person, Site]
 
     static constraints = {
@@ -26,5 +25,4 @@
         postCode(blank:false,maxSize:50)
         country(blank:false,maxSize:50)
-        manufacturer(nullable:true)
         supplier(nullable:true)
         person(nullable:true)
Index: /trunk/grails-app/domain/Contact.groovy
===================================================================
--- /trunk/grails-app/domain/Contact.groovy	(revision 721)
+++ /trunk/grails-app/domain/Contact.groovy	(revision 722)
@@ -3,5 +3,4 @@
     ContactType contactType
 
-    Manufacturer manufacturer
     Supplier supplier
     Person person
@@ -12,10 +11,9 @@
 //     hasMany = []
 
-    static belongsTo = [Manufacturer, Supplier, Person, Site]
+    static belongsTo = [Supplier, Person, Site]
 
     static constraints = {
         value(maxSize:50)
 
-        manufacturer(nullable:true)
         supplier(nullable:true)
         person(nullable:true)
Index: unk/grails-app/domain/Manufacturer.groovy
===================================================================
--- /trunk/grails-app/domain/Manufacturer.groovy	(revision 721)
+++ 	(revision )
@@ -1,20 +1,0 @@
-class Manufacturer {
-    ManufacturerType manufacturerType
-    String name
-    String description = ""
-    boolean isActive = true
-
-    static hasMany = [contacts: Contact,
-                                    addresses: Address]
-
-//     static belongsTo = []
-
-    static constraints = {
-        name(maxSize:50,unique:true,blank:false)
-        description(maxSize:100)
-    }
-
-    String toString() {
-        "${this.name}"
-    }
-}
Index: unk/grails-app/domain/ManufacturerType.groovy
===================================================================
--- /trunk/grails-app/domain/ManufacturerType.groovy	(revision 721)
+++ 	(revision )
@@ -1,16 +1,0 @@
-class ManufacturerType {
-    String name
-    String description = ""
-    boolean isActive = true
-
-    static hasMany = [manufacturers: Manufacturer]
-
-    static constraints = {
-        name(maxSize:50,unique:true,blank:false)
-        description(maxSize:100)
-    }
-
-    String toString() {
-        "${this.name}"
-    }
-}
Index: /trunk/grails-app/i18n/messages.properties
===================================================================
--- /trunk/grails-app/i18n/messages.properties	(revision 721)
+++ /trunk/grails-app/i18n/messages.properties	(revision 722)
@@ -3,6 +3,6 @@
 #
 
-address.owner.not.found=An owner (Person, Site, Manufacturer or Supplier) must be supplied to create an address.
-contact.owner.not.found=An owner (Person, Site, Manufacturer or Supplier) must be supplied to create contact details.
+address.owner.not.found=An owner (Person, Site or Supplier) must be supplied to create an address.
+contact.owner.not.found=An owner (Person, Site or Supplier) must be supplied to create contact details.
 
 asset.tree.import.success=Asset tree imported.
@@ -407,5 +407,4 @@
 fp.property.text.spareFor.name=Spare For
 fp.property.text.supplier.name=Supplier
-fp.property.text.manufacturer.name=Manufacturer
 fp.property.text.estimatedUnitPriceAmount=Estimated Unit Price
 
Index: /trunk/grails-app/services/AddressService.groovy
===================================================================
--- /trunk/grails-app/services/AddressService.groovy	(revision 721)
+++ /trunk/grails-app/services/AddressService.groovy	(revision 722)
@@ -57,6 +57,4 @@
     private checkForOwner(params) {
 
-        if(params.manufacturer?.id)
-            return Manufacturer.exists(params.manufacturer.id)
         if(params.supplier?.id)
             return Supplier.exists(params.supplier.id)
Index: /trunk/grails-app/services/ContactService.groovy
===================================================================
--- /trunk/grails-app/services/ContactService.groovy	(revision 721)
+++ /trunk/grails-app/services/ContactService.groovy	(revision 722)
@@ -74,6 +74,4 @@
         def ownerInstance
 
-        if(params.manufacturer?.id)
-            return ownerInstance = Manufacturer.get(params.manufacturer.id)
         if(params.supplier?.id)
             return ownerInstance = Supplier.get(params.supplier.id)
@@ -89,6 +87,4 @@
         def ownerInstance
 
-        if(object.manufacturer)
-            return ownerInstance = object.manufacturer
         if(object.supplier)
             return ownerInstance = object.supplier
Index: /trunk/grails-app/services/CreateBulkDataService.groovy
===================================================================
--- /trunk/grails-app/services/CreateBulkDataService.groovy	(revision 721)
+++ /trunk/grails-app/services/CreateBulkDataService.groovy	(revision 722)
@@ -54,5 +54,4 @@
 //         createBulkTestDepartments()
 //         createBulkTestSuppliers()
-//         createBulkTestManufacturers()
 
         // Assets
Index: /trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- /trunk/grails-app/services/CreateDataService.groovy	(revision 721)
+++ /trunk/grails-app/services/CreateDataService.groovy	(revision 722)
@@ -66,5 +66,4 @@
         createBasePeriods()
         createBaseSupplierTypes()
-        createBaseManufacturerTypes()
         createBaseAddressTypes()
         createBaseContactTypes()
@@ -118,5 +117,4 @@
         createDemoDepartments()
         createDemoSuppliers()
-        createDemoManufacturers()
         createDemoProductionReference()
         createDemoPurchasingGroups()  /// @todo: Perhaps a 'createQuickStartData' method?
@@ -526,26 +524,4 @@
     }
 
-    def createBaseManufacturerTypes() {
-
-        // ManufacturerType
-        def manufacturerTypeInstance
-
-        // ManufacturerType #1
-        manufacturerTypeInstance = new ManufacturerType(name: "Unknown",
-                                                                        description: "Unknown manufacturer type")
-        saveAndTest(manufacturerTypeInstance)
-
-        // ManufacturerType #2
-        manufacturerTypeInstance = new ManufacturerType(name: "OEM",
-                                                                        description: "Original equipment manufacturer")
-        saveAndTest(manufacturerTypeInstance)
-
-        // ManufacturerType #3
-        manufacturerTypeInstance = new ManufacturerType(name: "Alternate",
-                                                                        description: "Not original equipment manufacturer")
-        saveAndTest(manufacturerTypeInstance)
-
-    }
-
     def createBaseAddressTypes() {
 
@@ -670,20 +646,4 @@
                                                                         supplierType: SupplierType.get(3))
         saveAndTest(supplierInstance)
-    }
-
-    def createDemoManufacturers() {
-
-        // Manufacturer
-        def manufacturerInstance
-
-        // Manufacturer #1
-        manufacturerInstance = new Manufacturer(name: "OEM Manufacturer",
-                                                                        manufacturerType: ManufacturerType.get(2))
-        saveAndTest(manufacturerInstance)
-
-        // Manufacturer #2
-        manufacturerInstance = new Manufacturer(name: "Laser Cutting Services Pty",
-                                                                        manufacturerType: ManufacturerType.get(3))
-        saveAndTest(manufacturerInstance)
     }
 
Index: /trunk/grails-app/views/addressDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/addressDetailed/create.gsp	(revision 721)
+++ /trunk/grails-app/views/addressDetailed/create.gsp	(revision 722)
@@ -22,18 +22,4 @@
                     <table>
                         <tbody>
-
-                            <g:if test="${addressInstance.manufacturer}">
-                                <g:hiddenField name="manufacturer.id" value="${addressInstance.manufacturer.id}"/>
-                                <tr class="prop">
-                                    <td valign="top" class="name">
-                                        <label for="manufacturer">Manufacturer:</label>
-                                    </td>
-                                    <td valign="top" class="value">
-                                        <g:link controller="manufacturerDetailed" action="show" id="${addressInstance.manufacturer.id}">
-                                            ${addressInstance.manufacturer.encodeAsHTML()}
-                                        </g:link>
-                                    </td>
-                                </tr>
-                            </g:if>
                             
                             <g:if test="${addressInstance.supplier}">
Index: /trunk/grails-app/views/addressDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/addressDetailed/edit.gsp	(revision 721)
+++ /trunk/grails-app/views/addressDetailed/edit.gsp	(revision 722)
@@ -24,17 +24,4 @@
                     <table>
                         <tbody>
-                        
-                            <g:if test="${addressInstance.manufacturer}">
-                                <tr class="prop">
-                                    <td valign="top" class="name">
-                                        <label for="manufacturer">Manufacturer:</label>
-                                    </td>
-                                    <td valign="top" class="value">
-                                        <g:link controller="manufacturerDetailed" action="show" id="${addressInstance.manufacturer.id}">
-                                            ${addressInstance.manufacturer.encodeAsHTML()}
-                                        </g:link>
-                                    </td>
-                                </tr> 
-                            </g:if>
                             
                             <g:if test="${addressInstance.supplier}">
Index: /trunk/grails-app/views/addressDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/addressDetailed/show.gsp	(revision 721)
+++ /trunk/grails-app/views/addressDetailed/show.gsp	(revision 722)
@@ -24,13 +24,4 @@
                             
                         </tr>
-                    
-                            <g:if test="${addressInstance.manufacturer}">
-                                <tr class="prop">
-                                    <td valign="top" class="name">Manufacturer:</td>
-                                    
-                                    <td valign="top" class="value"><g:link controller="manufacturerDetailed" action="show" id="${addressInstance.manufacturer.id}">${addressInstance.manufacturer.encodeAsHTML()}</g:link></td>
-                                    
-                                </tr>
-                            </g:if>
                             
                             <g:if test="${addressInstance.supplier}">
Index: /trunk/grails-app/views/appCore/manager.gsp
===================================================================
--- /trunk/grails-app/views/appCore/manager.gsp	(revision 721)
+++ /trunk/grails-app/views/appCore/manager.gsp	(revision 722)
@@ -38,6 +38,4 @@
                                 <br />
                                 <a href="${createLink(controller:'maintenancePolicyDetailed', action:'list')}">Maintenance Policies</a>
-                                <br />
-                                <a href="${createLink(controller:'manufacturerDetailed', action:'list')}">Manufacturers</a>
                                 <br />
                                 <a href="${createLink(controller:'purchasingGroupDetailed', action:'list')}">Purchasing Groups</a>
Index: /trunk/grails-app/views/contactDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/contactDetailed/create.gsp	(revision 721)
+++ /trunk/grails-app/views/contactDetailed/create.gsp	(revision 722)
@@ -22,18 +22,4 @@
                     <table>
                         <tbody>
-
-                            <g:if test="${contactInstance.manufacturer}">
-                                <g:hiddenField name="manufacturer.id" value="${contactInstance.manufacturer.id}"/>
-                                <tr class="prop">
-                                    <td valign="top" class="name">
-                                        <label for="manufacturer">Manufacturer:</label>
-                                    </td>
-                                    <td valign="top" class="value">
-                                        <g:link controller="manufacturerDetailed" action="show" id="${contactInstance.manufacturer.id}">
-                                            ${contactInstance.manufacturer.encodeAsHTML()}
-                                        </g:link>
-                                    </td>
-                                </tr>
-                            </g:if>
                             
                             <g:if test="${contactInstance.supplier}">
Index: /trunk/grails-app/views/contactDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/contactDetailed/edit.gsp	(revision 721)
+++ /trunk/grails-app/views/contactDetailed/edit.gsp	(revision 722)
@@ -24,18 +24,4 @@
                     <table>
                         <tbody>
-
-                            <g:if test="${contactInstance.manufacturer}">
-                                <g:hiddenField name="manufacturer.id" value="${contactInstance.manufacturer.id}"/>
-                                <tr class="prop">
-                                    <td valign="top" class="name">
-                                        <label for="manufacturer">Manufacturer:</label>
-                                    </td>
-                                    <td valign="top" class="value">
-                                        <g:link controller="manufacturerDetailed" action="show" id="${contactInstance.manufacturer.id}">
-                                            ${contactInstance.manufacturer.encodeAsHTML()}
-                                        </g:link>
-                                    </td>
-                                </tr>
-                            </g:if>
 
                             <g:if test="${contactInstance.supplier}">
Index: /trunk/grails-app/views/contactDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/contactDetailed/show.gsp	(revision 721)
+++ /trunk/grails-app/views/contactDetailed/show.gsp	(revision 722)
@@ -21,13 +21,4 @@
                             <td valign="top" class="value">${fieldValue(bean:contactInstance, field:'id')}</td>
                         </tr>
-
-                        <g:if test="${contactInstance.manufacturer}">
-                            <tr class="prop">
-                                <td valign="top" class="name">Manufacturer:</td>
-
-                                <td valign="top" class="value"><g:link controller="manufacturerDetailed" action="show" id="${contactInstance.manufacturer.id}">${contactInstance.manufacturer.encodeAsHTML()}</g:link></td>
-
-                            </tr>
-                        </g:if>
 
                         <g:if test="${contactInstance.supplier}">