From 0809ef942b72b9e5610be5fed133c27234640fef Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Fri, 25 Nov 2011 16:22:37 +0530
Subject: [PATCH] [IMP] sale: Removed/Corrected extra lines.

bzr revid: uco@tinyerp.com-20111125105237-uetukp6qx5oqujj2
---
 addons/sale/sale.py           | 5 +++++
 addons/sale/sale_workflow.xml | 1 -
 addons/sale/stock.py          | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 01948354139..ef27088033c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -43,6 +43,7 @@ class sale_shop(osv.osv):
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.shop', context=c),
     }
+
 sale_shop()
 
 class sale_order(osv.osv):
@@ -455,8 +456,10 @@ class sale_order(osv.osv):
             for record in self.pool.get('sale.order').browse(cr, uid, id).invoice_ids:
                 inv_ids1.add(record.id)
         inv_ids = list(inv_ids1.difference(inv_ids))
+
         res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
         res_id = res and res[1] or False,
+
         return {
             'name': _('Customer Invoices'),
             'view_type': 'form',
@@ -781,6 +784,7 @@ class sale_order(osv.osv):
         picking_obj = self.pool.get('stock.picking')
         procurement_obj = self.pool.get('procurement.order')
         proc_ids = []
+
         for line in order_lines:
             if line.state == 'done':
                 continue
@@ -1273,6 +1277,7 @@ class sale_order_line(osv.osv):
             if rec.state not in ['draft', 'cancel']:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is in state \'%s\'!') %(rec.state,))
         return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
+
 sale_order_line()
 
 class sale_config_picking_policy(osv.osv_memory):
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index 0bd52ed12cf..0ff5eb15ea0 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -222,7 +222,6 @@
             <field name="act_from" ref="act_ship"/>
             <field name="act_to" ref="act_ship_except"/>
             <field name="condition">test_state('canceled')</field>
-            
         </record>
         <record id="trans_ship_except_ship" model="workflow.transition">
             <field name="act_from" ref="act_ship_except"/>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index d123bef167c..9e0a47b3ceb 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -197,4 +197,6 @@ class stock_picking(osv.osv):
         return result
 
 stock_picking()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: