pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REM] removed auto_picking field + removed picking workflow

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20130724102017-0oel0yi08dsxvmxi
This commit is contained in:
Quentin (OpenERP)
2013-07-24 12:20:17 +02:00
parent 15f509178b
commit e3096577b2
6 changed files with 0 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/mrp.py
-4
View File
@@ -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
addons/point_of_sale/point_of_sale.py
-1
View File
@@ -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
addons/stock/__openerp__.py
-1
View File
@@ -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',
addons/stock/stock.py
-1
View File
@@ -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'),
addons/stock/stock_view.xml
-1
View File
@@ -630,7 +630,6 @@
<group>
<field name="move_type"/>
<field name="picking_type_id"/>
<field name="auto_picking" groups="base.group_user"/>
</group>
<group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
addons/stock/stock_workflow.xml
-119
View File
@@ -1,119 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="wkf_picking" model="workflow">
<field name="name">stock.picking.basic</field>
<field name="osv">stock.picking</field>
<field name="on_create">True</field>
</record>
<record id="act_draft" model="workflow.activity">
<field name="wkf_id" ref="wkf_picking"/>
<field name="flow_start">True</field>
<field name="name">draft</field>
</record>
<record id="act_confirmed" model="workflow.activity">
<field name="wkf_id" ref="wkf_picking"/>
<field name="name">confirmed</field>
<field name="kind">function</field>
<field name="action">action_confirm()</field>
</record>
<record id="act_assigned" model="workflow.activity">
<field name="wkf_id" ref="wkf_picking"/>
<field name="name">assigned</field>
<field name="kind">function</field>
<field name="action">action_assign_wkf()</field>
</record>
<record id="act_move" model="workflow.activity">
<field name="wkf_id" ref="wkf_picking"/>
<field name="name">move</field>
<field name="kind">function</field>
<field name="action">action_move()</field>
</record>
<record id="act_done" model="workflow.activity">
<field name="wkf_id" ref="wkf_picking"/>
<field name="name">done</field>
<field name="kind">function</field>
<field name="action">action_done()</field>
<field name="flow_stop">True</field>
</record>
<record id="act_cancel" model="workflow.activity">
<field name="wkf_id" ref="wkf_picking"/>
<field name="name">cancel</field>
<field name="flow_stop">True</field>
<field name="kind">function</field>
<field name="action">action_cancel()</field>
</record>
<record id="trans_draft_confirmed" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_confirmed"/>
<field name="signal">button_confirm</field>
</record>
<record id="trans_confirmed_assigned_back" model="workflow.transition">
<field name="act_from" ref="act_assigned"/>
<field name="act_to" ref="act_confirmed"/>
<field name="condition">not test_assigned()</field>
</record>
<record id="trans_confirmed_assigned" model="workflow.transition">
<field name="act_from" ref="act_confirmed"/>
<field name="act_to" ref="act_assigned"/>
<field name="condition">test_assigned()</field>
</record>
<record id="trans_assigned_move_done" model="workflow.transition">
<field name="act_from" ref="act_assigned"/>
<field name="act_to" ref="act_move"/>
<field name="condition">test_done()</field>
</record>
<record id="trans_assigned_move" model="workflow.transition">
<field name="act_from" ref="act_assigned"/>
<field name="act_to" ref="act_move"/>
<field name="condition">auto_picking</field>
</record>
<record id="trans_assigned_move2" model="workflow.transition">
<field name="act_from" ref="act_assigned"/>
<field name="act_to" ref="act_move"/>
<field name="signal">button_done</field>
</record>
<record id="trans_move_done" model="workflow.transition">
<field name="act_from" ref="act_move"/>
<field name="act_to" ref="act_done"/>
<field name="condition">test_finished()</field>
</record>
<record id="trans_move_confirmed" model="workflow.transition">
<field name="act_from" ref="act_move"/>
<field name="act_to" ref="act_confirmed"/>
<field name="condition">not test_finished()</field>
</record>
<record id="trans_assigned_cancel" model="workflow.transition">
<field name="act_from" ref="act_assigned"/>
<field name="act_to" ref="act_cancel"/>
<field name="condition">True</field>
<field name="signal">button_cancel</field>
</record>
<record id="trans_confirmed_cancel" model="workflow.transition">
<field name="act_from" ref="act_confirmed"/>
<field name="act_to" ref="act_cancel"/>
<field name="condition">allow_cancel()</field>
<field name="signal">button_cancel</field>
</record>
<record id="trans_draft_cancel" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_cancel"/>
<field name="signal">button_cancel</field>
</record>
<record id="trans_assigned_cancel_auto" model="workflow.transition">
<field name="act_from" ref="act_assigned"/>
<field name="act_to" ref="act_cancel"/>
<field name="condition">test_cancel()</field>
</record>
<record id="trans_confirmed_cancel_auto" model="workflow.transition">
<field name="act_from" ref="act_confirmed"/>
<field name="act_to" ref="act_cancel"/>
<field name="condition">test_cancel()</field>
</record>
</data>
</openerp>