From 1b8b85c9d51135cb8a1145227126076574db9bfb Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 23 Jun 2010 16:54:15 +0530
Subject: [PATCH] [REM] purchase wizard view and misc changes

bzr revid: mra@mra-laptop-20100623112415-1y11p2k0j3ylm7o9
---
 addons/purchase/company.py          |  6 +++---
 addons/purchase/partner.py          | 15 ++++++---------
 addons/purchase/purchase_wizard.xml | 13 -------------
 addons/purchase/stock.py            |  6 +++---
 4 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 addons/purchase/purchase_wizard.xml

diff --git a/addons/purchase/company.py b/addons/purchase/company.py
index 2a01605782c..012bb2142c0 100644
--- a/addons/purchase/company.py
+++ b/addons/purchase/company.py
@@ -28,9 +28,9 @@ class company(osv.osv):
             help="This is the leads/security time for each purchase order."),
     }
     _defaults = {
-        'po_lead': lambda *a: 1.0,
+        'po_lead': 1.0,
     }
+
 company()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 48d006f2c15..afd13f6829e 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,17 +27,14 @@ class res_partner(osv.osv):
     _columns = {
         'property_product_pricelist_purchase': fields.property(
           'product.pricelist',
-          type='many2one', 
-          relation='product.pricelist', 
+          type='many2one',
+          relation='product.pricelist',
           domain=[('type','=','purchase')],
-          string="Purchase Pricelist", 
+          string="Purchase Pricelist",
           method=True,
           view_load=True,
           help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
     }
 res_partner()
 
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/purchase/purchase_wizard.xml b/addons/purchase/purchase_wizard.xml
deleted file mode 100644
index d76ce1e3819..00000000000
--- a/addons/purchase/purchase_wizard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/stock.py b/addons/purchase/stock.py
index 087c9d6ddc8..245da72cad8 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@ class stock_move(osv.osv):
             readonly=True),
     }
     _defaults = {
-        'purchase_line_id': lambda *a:False
+        'purchase_line_id': False
     }
 stock_move()