From 19952870948cb82359db554c78288b7e6697280e Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Wed, 11 Dec 2013 21:02:21 +0100 Subject: [PATCH] [FIX] remove python modules and views related to sale, added by error during extraction --- stock_location_ownership/model/sale.py | 54 ------------------- .../test/sale_order_not_sourced.yml | 38 ------------- .../test/sale_order_source.yml | 40 -------------- stock_location_ownership/view/sale_view.xml | 27 ---------- 4 files changed, 159 deletions(-) delete mode 100644 stock_location_ownership/model/sale.py delete mode 100644 stock_location_ownership/test/sale_order_not_sourced.yml delete mode 100644 stock_location_ownership/test/sale_order_source.yml delete mode 100644 stock_location_ownership/view/sale_view.xml diff --git a/stock_location_ownership/model/sale.py b/stock_location_ownership/model/sale.py deleted file mode 100644 index 954d98950..000000000 --- a/stock_location_ownership/model/sale.py +++ /dev/null @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Guewen Baconnier -# Copyright 2013 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# 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 . -# -############################################################################## - -from openerp.osv import orm, fields - - -class sale_order(orm.Model): - _inherit = 'sale.order' - - def _prepare_order_line_move(self, cr, uid, order, line, picking_id, - date_planned, context=None): - values = super(sale_order, self)._prepare_order_line_move( - cr, uid, order, line, picking_id, date_planned, context=context) - if line.location_id: - values['location_id'] = line.location_id.id - return values - - def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, - context=None): - values = super(sale_order, self)._prepare_order_line_procurement( - cr, uid, order, line, move_id, date_planned, context=context) - if line.location_id: - values['location_id'] = line.location_id.id - return values - - -class sale_order_line(orm.Model): - _inherit = 'sale.order.line' - - _columns = { - 'location_id': fields.many2one( - 'stock.location', - 'Source Location', - help="If a source location is selected, " - "it will be used as source of the stock moves. "), - } diff --git a/stock_location_ownership/test/sale_order_not_sourced.yml b/stock_location_ownership/test/sale_order_not_sourced.yml deleted file mode 100644 index 97aca450f..000000000 --- a/stock_location_ownership/test/sale_order_not_sourced.yml +++ /dev/null @@ -1,38 +0,0 @@ -- - In order to check if the source location of a sale order line - still use the location of the shop if not specified on the - sale order line. -- - !record {model: sale.order, id: sale_notsourced_01}: - partner_id: base.res_partner_2 - note: Invoice after delivery - order_line: - - product_id: product.product_product_7 - product_uom_qty: 8 -- - When I confirm the sale order -- - !workflow {model: sale.order, action: order_confirm, ref: sale_notsourced_01} -- - Then a delivery order should have been generated -- - !python {model: sale.order}: | - sale_order = self.browse(cr, uid, ref("sale_notsourced_01")) - assert len(sale_order.picking_ids) == 1, ( - "1 delivery order expected, got %d" % len(sale_order.picking_ids)) -- - And the source location of the stock move should be the one of - the sales order's shop -- - !python {model: sale.order}: | - sale_order = self.browse(cr, uid, ref("sale_notsourced_01")) - picking = sale_order.picking_ids[0] - location_id = sale_order.shop_id.warehouse_id.lot_stock_id - for move in picking.move_lines: - assert move.location_id == location_id, ( - "Wrong location_id, expected %s, got %s" % - (location_id, move.location_id)) - for procurement in move.procurements: - assert procurement.location_id == location_id, ( - "Wrong location_id in procurement.order, expected %s, got %s" % - (location_id, procurement.location_id)) diff --git a/stock_location_ownership/test/sale_order_source.yml b/stock_location_ownership/test/sale_order_source.yml deleted file mode 100644 index ac2572cd1..000000000 --- a/stock_location_ownership/test/sale_order_source.yml +++ /dev/null @@ -1,40 +0,0 @@ -- - In order to check if the source location of a sale order line - becomes the source location of the delivery stock move. - I create a sale order. -- - !record {model: sale.order, id: sale_source_01}: - partner_id: base.res_partner_2 - note: Invoice after delivery - order_line: - - product_id: product.product_product_7 - product_uom_qty: 8 - location_id: stock.stock_location_shop1 -- - When I confirm the sale order -- - !workflow {model: sale.order, action: order_confirm, ref: sale_source_01} -- - Then a delivery order should have been generated -- - !python {model: sale.order}: | - sale_order = self.browse(cr, uid, ref("sale_source_01")) - assert len(sale_order.picking_ids) == 1, ( - "1 delivery order expected, got %d" % len(sale_order.picking_ids)) -- - And the source location of the stock move should be the one of - the sale order line -- - !python {model: sale.order}: | - sale_order = self.browse(cr, uid, ref("sale_source_01")) - picking = sale_order.picking_ids[0] - for move in picking.move_lines: - expected_location_id = move.sale_line_id.location_id - assert move.location_id == expected_location_id, ( - "Wrong location_id in stock.move, expected %s, got %s" % - (expected_location_id, move.location_id)) - for procurement in move.procurements: - assert procurement.location_id == expected_location_id, ( - "Wrong location_id in procurement.order, expected %s, got %s" % - (expected_location_id, procurement.location_id)) - diff --git a/stock_location_ownership/view/sale_view.xml b/stock_location_ownership/view/sale_view.xml deleted file mode 100644 index c60e8d3cb..000000000 --- a/stock_location_ownership/view/sale_view.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - sale.order.form - sale.order - - - - - - - - - sale.order.form - sale.order - - - - - - - - -