[IMP]purchase_tender: rename the object

bzr revid: sbh@tinyerp.com-20100412114629-010pbvlej3e6628l

4 files changed, 19 insertions, 16 deletions

diff --git a/addons/purchase_tender/purchase_tender.py b/addons/purchase_tender/purchase_tender.py
index 5f3ac5e16ee..e4f5216828f 100644
--- a/addons/purchase_tender/purchase_tender.py
+++ b/addons/purchase_tender/purchase_tender.py
@@ -42,6 +42,7 @@ class purchase_tender(osv.osv):
     }
     _defaults = {
         'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'user_id': lambda obj, cr, uid, context: uid,
         'state': lambda *args: 'open',
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.tender'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
@@ -55,7 +56,6 @@ class purchase_tender(osv.osv):
         return True        
     def tender_cancel(self, cr, uid, ids, context={}):
         purchase_order_obj = self.pool.get('purchase.order')
-        wf_service = netsvc.LocalService("workflow")
         for purchase in self.browse(cr, uid, ids):
             for purchase_id in purchase.purchase_ids:
                 if str(purchase_id.state) in('draft','wait'):
@@ -70,7 +70,9 @@ class purchase_tender(osv.osv):
         return True    
     def tender_done(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'done'}, context=context)
-        return True        
+        return True     
+    
+      
 purchase_tender()
 
 class purchase_tender_line(osv.osv):
@@ -121,6 +123,8 @@ class purchase_order(osv.osv):
                         wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
                     self.pool.get('purchase.tender').write(cr, uid, [po.tender_id.id], {'state':'close'})
         return res
+    
+    
 purchase_order()
 
 
diff --git a/addons/purchase_tender/purchase_tender_view.xml b/addons/purchase_tender/purchase_tender_view.xml
index e54c744ad3d..281c2751961 100644
--- a/addons/purchase_tender/purchase_tender_view.xml
+++ b/addons/purchase_tender/purchase_tender_view.xml
@@ -60,7 +60,7 @@
                     </page>
                     <page string="Quotations">
                      	<group col="8" colspan="4">
-                    	<button name="%(action_purchase_requisition_partner)d" string="New RfQr" type="action" />
+                    	<button name="%(action_purchase_tender_partner)d" string="New RfQr" type="action" />
                     	 <label colspan="6"  string=""/>
                     	  </group>
                     	<field name="purchase_ids" nolabel="1" colspan="4"/>
diff --git a/addons/purchase_tender/wizard/purchase_tender_partner.py b/addons/purchase_tender/wizard/purchase_tender_partner.py
index 31c2fc2c189..070c471c256 100644
--- a/addons/purchase_tender/wizard/purchase_tender_partner.py
+++ b/addons/purchase_tender/wizard/purchase_tender_partner.py
@@ -27,9 +27,9 @@ import time
 from mx import DateTime
 from osv.orm import browse_record, browse_null
 
-class purchase_requisition_partner(osv.osv_memory):
-    _name = "purchase.requisition.partner"
-    _description = "Purchase Requisition"
+class purchase_tender_partner(osv.osv_memory):
+    _name = "purchase.tender.partner"
+    _description = "Purchase Tender Partner"
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
     }
@@ -40,7 +40,7 @@ class purchase_requisition_partner(osv.osv_memory):
 
     def create_order(self, cr, uid, ids, context):
         """ 
-             To merge similar type of purchase orders.
+             To Create a purchase orders .
             
              @param self: The object pointer.
              @param cr: A database cursor
@@ -58,7 +58,6 @@ class purchase_requisition_partner(osv.osv_memory):
             order_line_obj = self.pool.get('purchase.order.line')
             partner_obj = self.pool.get('res.partner')
             tender_line_obj = self.pool.get('purchase.tender.line')
-            uom_obj = self.pool.get('product.uom')
             pricelist_obj = self.pool.get('product.pricelist')
             prod_obj = self.pool.get('product.product')
             tender_obj = self.pool.get('purchase.tender')
@@ -115,5 +114,5 @@ class purchase_requisition_partner(osv.osv_memory):
                     order_line_obj.create(cr,uid,order_line)
         return {}        
 
-purchase_requisition_partner()
+purchase_tender_partner()
 
diff --git a/addons/purchase_tender/wizard/purchase_tender_partner.xml b/addons/purchase_tender/wizard/purchase_tender_partner.xml
index 5fdf0c01b49..10528517907 100644
--- a/addons/purchase_tender/wizard/purchase_tender_partner.xml
+++ b/addons/purchase_tender/wizard/purchase_tender_partner.xml
@@ -1,12 +1,12 @@
 <openerp>
       <data>
 
-    	<record id="view_purchase_requisition_partner" model="ir.ui.view">
-            <field name="name">Purchase Requisition</field>
-            <field name="model">purchase.requisition.partner</field>
+    	<record id="view_purchase_tender_partner" model="ir.ui.view">
+            <field name="name">Purchase Tender</field>
+            <field name="model">purchase.tender.partner</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Purchase Requisition">
+              	<form string="Purchase Tender">
               		 <field name="partner_id"/>
 		              <group colspan="4" col="6">
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
@@ -16,10 +16,10 @@
             </field>
 		</record>
 
-		<record id="action_purchase_requisition_partner" model="ir.actions.act_window">
-	           <field name="name">Purchase Requisition</field>
+		<record id="action_purchase_tender_partner" model="ir.actions.act_window">
+	           <field name="name">Purchase Tender</field>
 	           <field name="type">ir.actions.act_window</field>
-	           <field name="res_model">purchase.requisition.partner</field>
+	           <field name="res_model">purchase.tender.partner</field>
 	           <field name="view_type">form</field>
 	           <field name="view_mode">form</field>
 		       <field name="context">{'record_id' : active_id}</field>