diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 6576c2b97fb..01948354139 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -43,7 +43,6 @@ 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): @@ -456,10 +455,8 @@ 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', @@ -1276,7 +1273,6 @@ 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_demo.xml b/addons/sale/sale_demo.xml index a5314a8f3e8..d96f735d6f5 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -140,7 +140,7 @@ [PC1] Basic PC - 15 + 2 450 make_to_order 8 @@ -240,7 +240,7 @@ [MB1] Mainboard ASUStek A7N8X - 4 + 15 250 make_to_order 15 @@ -250,7 +250,7 @@ [MB2] Mainboard ASUStek A7V8X-X - 4 + 5 500 make_to_order 15 diff --git a/addons/sale/stock.py b/addons/sale/stock.py index e638cbe27f3..f8e10a5f5ca 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -20,7 +20,6 @@ ############################################################################## from osv import osv, fields -import netsvc class stock_move(osv.osv): _inherit = 'stock.move' @@ -198,4 +197,3 @@ class stock_picking(osv.osv): return result stock_picking() -