From 61384534974e97f2bb1ddea41a8d09f9bc2e5a4e Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 2 Aug 2011 18:57:14 +0530 Subject: [PATCH] [IMP]stock:Improvement in yml bzr revid: mma@tinyerp.com-20110802132714-jh8jam8fgdwv3t5g --- addons/stock/test/stock_test_wizard.yml | 14 ++++- addons/stock/wizard/__init__.py | 1 - addons/stock/wizard/stock_move.py | 29 --------- addons/stock/wizard/stock_move_view.xml | 29 --------- addons/stock/wizard/stock_replacement.py | 61 ------------------- .../stock/wizard/stock_replacement_view.xml | 41 ------------- 6 files changed, 11 insertions(+), 164 deletions(-) delete mode 100644 addons/stock/wizard/stock_replacement.py delete mode 100644 addons/stock/wizard/stock_replacement_view.xml diff --git a/addons/stock/test/stock_test_wizard.yml b/addons/stock/test/stock_test_wizard.yml index ff1f7f48b54..f6b253186ae 100644 --- a/addons/stock/test/stock_test_wizard.yml +++ b/addons/stock/test/stock_test_wizard.yml @@ -141,15 +141,23 @@ state: assigned - - I Check onchange and _getSSCC function of stock.move object + I Check onchange function of stock.move object - !python {model: stock.move }: | self.onchange_lot_id(cr, uid, [ref("stock_move_test0")], ref("stock.stock_production_lot0"), 5, ref("stock.stock_location_suppliers"), ref("product.product_product_pc1"), ref("product.product_uom_unit"), None) self.onchange_quantity(cr, uid, [ref("stock_move_test0")], ref("product.product_product_pc1"), 10, ref("product.product_uom_unit"), ref("product.product_uom_unit")) self.onchange_uos_quantity(cr, uid, [ref("stock_move_test0")], ref("product.product_product_pc1"), 10, ref("product.product_uom_unit"), ref("product.product_uom_unit")) self.onchange_product_id(cr, uid, [ref("stock_move_test0")], ref("product.product_product_pc1"), ref("stock.stock_location_suppliers"), ref("stock.stock_location_shop0"), False) - self._getSSCC(cr, uid , {"lang": 'en_US', "default_location_dest_id": ref("stock.stock_location_shop0"), "active_model": - "stock.move", "search_default_receive": 1, 'product_receive': True, "default_location_id": ref("stock.stock_location_suppliers"),"active_ids":[ref("stock_move_test0")], "tz": False, "active_id":ref("stock_move_test0")}) + +- + I Check _getSSCC and action_partial_move function of stock.move object +- + !python {model: stock.move }: | + context = {"lang": 'en_US', "default_location_dest_id": ref("stock.stock_location_shop0"), "active_model": + "stock.move", "search_default_receive": 1, 'product_receive': True, "default_location_id": ref("stock.stock_location_suppliers"),"active_ids":[ref("stock_move_test0")], "tz": False, "active_id":ref("stock_move_test0")} + self._getSSCC(cr, uid , context) + self.action_partial_move(cr, uid , [ref("stock_move_test0")], context) + - I check write function - diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py index b0b091be07a..e37483bfb37 100644 --- a/addons/stock/wizard/__init__.py +++ b/addons/stock/wizard/__init__.py @@ -24,7 +24,6 @@ import stock_move import stock_splitinto import stock_partial_picking import stock_partial_move -import stock_replacement import stock_inventory_merge import stock_fill_inventory import stock_inventory_line_split diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py index b075af80c7d..f2eff0b6b27 100644 --- a/addons/stock/wizard/stock_move.py +++ b/addons/stock/wizard/stock_move.py @@ -23,35 +23,6 @@ from osv import fields, osv import decimal_precision as dp -class stock_move_track(osv.osv_memory): - _name = "stock.move.track" - _description = "Track moves" - - _columns = { - 'tracking_prefix': fields.char('Tracking prefix', size=64), - 'quantity': fields.float("Quantity per lot") - } - - _defaults = { - 'quantity': lambda *x: 1 - } - - def track_lines(self, cr, uid, ids, context=None): - """ To track stock moves lines - @param self: The object pointer. - @param cr: A database cursor - @param uid: ID of the user currently logged in - @param ids: An ID or list of IDs if we want more than one - @param context: A standard dictionary - @return: - """ - datas = self.read(cr, uid, ids)[0] - move_obj = self.pool.get('stock.move') - move_obj._track_lines(cr, uid, context['active_id'], datas, context=context) - return {'type': 'ir.actions.act_window_close'} - -stock_move_track() - class stock_move_consume(osv.osv_memory): _name = "stock.move.consume" _description = "Consume Products" diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml index baaa581b4f3..591940fab29 100644 --- a/addons/stock/wizard/stock_move_view.xml +++ b/addons/stock/wizard/stock_move_view.xml @@ -1,35 +1,6 @@ - - - Tracking a move - stock.move.track - form - -
- - - - -