diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 7949564187e..80b09d90803 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Install Extra Modules</attribute>
+                  <attribute name="string">Purchase Modules Installation</attribute>
                 </form>
                 <xpath expr="//label[@string='description']"
                        position="attributes">
diff --git a/addons/purchase_tender/wizard/purchase_tender_partner.py b/addons/purchase_tender/wizard/purchase_tender_partner.py
index da656def85a..1b6e1e3b40b 100644
--- a/addons/purchase_tender/wizard/purchase_tender_partner.py
+++ b/addons/purchase_tender/wizard/purchase_tender_partner.py
@@ -35,6 +35,20 @@ class purchase_tender_partner(osv.osv_memory):
         'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True),
     }
 
+        
+    def view_init(self, cr, uid, fields_list, context=None):
+        res = super(purchase_tender_partner, self).view_init(cr, uid, fields_list, context=context)
+        record_id = context and context.get('active_id', False) or False        
+        tender = self.pool.get('purchase.tender').browse(cr, uid, record_id)
+        if not tender.line_ids:
+                raise osv.except_osv('Error!','No Product in Tender')
+        True
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id):
+        addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['default'])
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        return {'value':{'partner_address_id': addr['default']}}
+        
     def create_order(self, cr, uid, ids, context):
         """ 
              To Create a purchase orders .
diff --git a/addons/purchase_tender/wizard/purchase_tender_partner.xml b/addons/purchase_tender/wizard/purchase_tender_partner.xml
index 3820992163e..aca1599041b 100644
--- a/addons/purchase_tender/wizard/purchase_tender_partner.xml
+++ b/addons/purchase_tender/wizard/purchase_tender_partner.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Purchase Tender">
-              		 <field name="partner_id"/>
+              		 <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               		 <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/>
 		              <group colspan="4" col="6">
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>