diff --git a/addons/product/wizard/specify_product_terminology.py b/addons/product/wizard/specify_product_terminology.py
index c0e52c21648..3bfe723b734 100644
--- a/addons/product/wizard/specify_product_terminology.py
+++ b/addons/product/wizard/specify_product_terminology.py
@@ -56,7 +56,57 @@ class specify_product_terminology(osv.osv_memory):
     }
     
     def onchange_partner_product_term(self, cr, uid, ids, partner,products,context=None):
-        return {'value' : {'terminolgy_ids': [{'new_name': partner,'old_name':'Partners'},{'new_name': products,'old_name':'Products'}]}}
+        
+        partner_list = []
+        product_list = []
+        #For Partner selection 
+        if partner == 'partners':
+            partner_list  =[ {'new_name': 'partner','old_name':'partner'},{'new_name': 'Partner','old_name':'Partner'},{'new_name': 'partners','old_name':'partners'},{'new_name': 'Partners','old_name':'Partners'}]
+            
+        if partner == 'customers':
+            partner_list  =[ {'new_name': 'customer','old_name':'partner'},{'new_name': 'Customer','old_name':'Partner'},{'new_name': 'customers','old_name':'customers'},{'new_name': 'Customers','old_name':'Customers'}]
+        
+        if partner == 'clients':
+            partner_list  =[ {'new_name': 'client','old_name':'partner'},{'new_name': 'Client','old_name':'Partner'},{'new_name': 'clients','old_name':'partners'},{'new_name': 'Clients','old_name':'Partners'}]
+
+        if partner == 'members':
+            partner_list  =[ {'new_name': 'member','old_name':'partner'},{'new_name': 'Member','old_name':'Partner'},{'new_name': 'members','old_name':'partners'},{'new_name': 'Members','old_name':'Partners'}]
+
+        if partner == 'patients':
+            partner_list  =[ {'new_name': 'patient','old_name':'partner'},{'new_name': 'Patient','old_name':'Partner'},{'new_name': 'patients','old_name':'partners'},{'new_name': 'Patients','old_name':'Partners'}]
+
+        if partner == 'donors':
+            partner_list  =[ {'new_name': 'donor','old_name':'partner'},{'new_name': 'Donor','old_name':'Partner'},{'new_name': 'donors','old_name':'partners'},{'new_name': 'Donors','old_name':'Partners'}]
+
+        if partner == 'guests':
+            partner_list  =[ {'new_name': 'guest','old_name':'partner'},{'new_name': 'Guest','old_name':'Partner'},{'new_name': 'guests','old_name':'partners'},{'new_name': 'Guests','old_name':'Partners'}]
+
+        if partner == 'tenants':
+            partner_list  =[ {'new_name': 'tenant','old_name':'partner'},{'new_name': 'Tenant','old_name':'Partner'},{'new_name': 'tenants','old_name':'partners'},{'new_name': 'Tenants','old_name':'Partners'}]
+        
+        # For Product selection
+        if products == 'products':
+            product_list  =[ {'new_name': 'product','old_name':'product'},{'new_name': 'Product','old_name':'Product'},{'new_name': 'products','old_name':'products'},{'new_name': 'Products','old_name':'Products'}]
+
+        if products == 'contracts':
+            product_list  =[ {'new_name': 'contract','old_name':'product'},{'new_name': 'Contract','old_name':'Product'},{'new_name': 'contracts','old_name':'products'},{'new_name': 'Contracts','old_name':'Products'}]
+
+        if products == 'goods':
+            product_list  =[ {'new_name': 'goods','old_name':'product'},{'new_name': 'Goods','old_name':'Product'},{'new_name': 'goods','old_name':'products'},{'new_name': 'Goods','old_name':'Products'}]
+
+        if products == 'services':
+            product_list  =[ {'new_name': 'service','old_name':'product'},{'new_name': 'Service','old_name':'Product'},{'new_name': 'services','old_name':'products'},{'new_name': 'Services','old_name':'Products'}]
+
+        if products == 'membership':
+            product_list  =[ {'new_name': 'membership','old_name':'product'},{'new_name': 'Membership','old_name':'Product'},{'new_name': 'memberships','old_name':'products'},{'new_name': 'Memberships','old_name':'Products'}]
+
+        if products == 'artwork':
+            product_list  =[ {'new_name': 'artwork','old_name':'product'},{'new_name': 'Artwork','old_name':'Product'},{'new_name': 'artworks','old_name':'products'},{'new_name': 'Artworks','old_name':'Products'}]
+       
+        term_list = partner_list + product_list
+        
+        return {'value' : {'terminolgy_ids': term_list}}
+
     
 specify_product_terminology()