From e3096577b2f0d0db0a4cba1369f35121e00ab67e Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 24 Jul 2013 12:20:17 +0200 Subject: [PATCH] [REM] removed auto_picking field + removed picking workflow bzr revid: qdp-launchpad@openerp.com-20130724102017-0oel0yi08dsxvmxi --- addons/mrp/mrp.py | 4 - addons/point_of_sale/point_of_sale.py | 1 - addons/stock/__openerp__.py | 1 - addons/stock/stock.py | 1 - addons/stock/stock_view.xml | 1 - addons/stock/stock_workflow.xml | 119 -------------------------- 6 files changed, 127 deletions(-) delete mode 100644 addons/stock/stock_workflow.xml diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 207f94c98be..b2226ab8619 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -877,10 +877,6 @@ class mrp_production(osv.osv): res = False return res - def _get_auto_picking(self, cr, uid, production): - return True - - def _make_production_produce_line(self, cr, uid, production, context=None): stock_move = self.pool.get('stock.move') source_location_id = production.product_id.property_stock_production.id diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 370aa2e55ff..3efc01687a5 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -693,7 +693,6 @@ class pos_order(osv.osv): 'move_type': 'direct', 'note': order.note or "", 'invoice_state': 'none', - 'auto_picking': True, }, context=context) self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context) location_id = order.warehouse_id.lot_stock_id.id diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 644a0dac45b..59e27ec3467 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -78,7 +78,6 @@ Dashboard / Reports for Warehouse Management will include: 'wizard/make_procurement_view.xml', 'wizard/mrp_procurement_view.xml', 'wizard/orderpoint_procurement_view.xml', -# 'stock_workflow.xml', 'stock_incoterms.xml', 'stock_report.xml', 'stock_view.xml', diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 423a1411956..ff5894a91cf 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -466,7 +466,6 @@ class stock_picking(osv.osv): 'max_date': fields.function(get_min_max_date, multi="min_max_date", store=True, type='datetime', string='Max. Expected Date', select=2), 'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}), - 'auto_picking': fields.boolean('Auto-Picking', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'partner_id': fields.many2one('res.partner', 'Partner', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'company_id': fields.many2one('res.company', 'Company', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'pack_operation_ids': fields.one2many('stock.pack.operation', 'picking_id', string='Related Packing Operations'), diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 5547395ae60..7358cf0cead 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -630,7 +630,6 @@ - diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml deleted file mode 100644 index c562e84a090..00000000000 --- a/addons/stock/stock_workflow.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - stock.picking.basic - stock.picking - True - - - - True - draft - - - - confirmed - function - action_confirm() - - - - assigned - function - action_assign_wkf() - - - - move - function - action_move() - - - - done - function - action_done() - True - - - - - cancel - True - function - action_cancel() - - - - - - button_confirm - - - - - not test_assigned() - - - - - test_assigned() - - - - - test_done() - - - - - auto_picking - - - - - button_done - - - - - test_finished() - - - - - not test_finished() - - - - - True - button_cancel - - - - - allow_cancel() - button_cancel - - - - - button_cancel - - - - - - test_cancel() - - - - - test_cancel() - - - -