[IMP]purchase:Osv memory wizard modified, naming conventions, act_window added

bzr revid: mso@mso-20100317083515-2u06q12zen7tmzc2

6 files changed, 34 insertions, 18 deletions

diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index 7c5aa05f640..98c8b73b789 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -36,9 +36,9 @@
         'purchase_workflow.xml',
         'purchase_sequence.xml',
         'purchase_data.xml',
+        'wizard/purchase_order_group_view.xml',
         'purchase_view.xml',
         'purchase_report.xml',
-        'purchase_wizard.xml',
         'stock_view.xml',
         'partner_view.xml',
         'process/purchase_process.xml'
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 53e9754a9d0..70942eacdcf 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -288,7 +288,7 @@
             name="Product purchases"
             res_model="purchase.order.line"
             src_model="product.product"/>
-
+<!-- 
 	<record model="ir.values" id="action_merge_purchase_order">
                 <field name="object" eval="1" />
                 <field name="name">Purchase Order</field>
@@ -297,5 +297,6 @@
                 <field name="key">action</field>
                 <field name="model">purchase.order</field>
          </record>
+          -->
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_wizard.xml b/addons/purchase/purchase_wizard.xml
index e7fd3ce6efc..d76ce1e3819 100644
--- a/addons/purchase/purchase_wizard.xml
+++ b/addons/purchase/purchase_wizard.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
+  <!-- 
     <wizard id="purchase_order_merge"
             model="purchase.order"
             multi="True"
             keyword="client_action_multi"
             name="purchase.order.merge"
             string="Merge purchases"/>
+             -->
   </data>
 </openerp>
diff --git a/addons/purchase/wizard/__init__.py b/addons/purchase/wizard/__init__.py
index e79d70fbaeb..73bb88500a8 100644
--- a/addons/purchase/wizard/__init__.py
+++ b/addons/purchase/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wizard_group
+import purchase_order_group
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/wizard/purchase_order_group b/addons/purchase/wizard/purchase_order_group.py
index 4c92fda53d8..c34b610f26b 100644
--- a/addons/purchase/wizard/purchase_order_group
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -35,6 +35,18 @@ class purchase_order_group(osv.osv_memory):
 		} 
 
 	def merge_orders(self, cr, uid, ids, context):
+		""" 
+		     To merge similar type of purchase orders.
+		    
+		     @param self: The object pointer.
+		     @param cr: A database cursor
+		     @param uid: ID of the user currently logged in
+		     @param ids: the ID or list of IDs 
+		     @param context: A standard dictionary 
+		     
+		     @return: purchase order view
+			
+		"""      		
 	        order_obj = self.pool.get('purchase.order')
 		mod_obj =self.pool.get('ir.model.data')
 		result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
@@ -43,6 +55,14 @@ class purchase_order_group(osv.osv_memory):
 
  	
 		def make_key(br, fields):
+			""" 
+			     Returns tuple indicating the value corresponding to fields
+			    
+			     @param br: record object
+			     @param fields: name of fields
+			     @return: Returns tuple indicating the value corresponding to fields
+				
+			"""      			
 			list_key = []
 			for field in fields:
 			    field_val = getattr(br, field)
@@ -65,7 +85,6 @@ class purchase_order_group(osv.osv_memory):
     
 		for porder in [order for order in order_obj.browse(cr, uid, context['active_ids']) if order.state == 'draft']:
 			order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
-
 			new_order = new_orders.setdefault(order_key, ({}, []))
 			new_order[1].append(porder.id)
 			order_infos = new_order[0]
@@ -139,9 +158,5 @@ class purchase_order_group(osv.osv_memory):
 		'type': 'ir.actions.act_window',
 		'search_view_id': id['res_id']
 		}
-
-		     
-
-   
 purchase_order_group()
 
diff --git a/addons/purchase/wizard/purchase_wizard_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 332aa5b041b..b943c64520d 100644
--- a/addons/purchase/wizard/purchase_wizard_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -31,16 +31,14 @@
             </field>
 		</record>
 
-	<record id="action_view_purchase_order_group" model="ir.actions.act_window">
-			<field name="name">Merge Purchase order</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">purchase.order.group</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-			<field name="view_id" ref="view_purchase_order_group"/>
-		</record>
-			
+         <act_window name="Merge Purchase orders"		    
+		    res_model="purchase.order.group"
+		    src_model="purchase.order"
+		    view_mode="form"
+		    target="new"        
+            key2="client_action_multi"    
+		    id="action_view_purchase_order_group"/>	
+		    			
     </data>
 </openerp>