[IMP] mrp, sale: Task ID-819: * sale/mrp.py should be removed. * sale_name and sale_ref fields should be removed.
bzr revid: uco@tinyerp.com-20100527132108-vlm1ijypkt9wwto1
This commit is contained in:
parent
fb6d7e5b9b
commit
c45aa850a7
|
@ -474,18 +474,6 @@ class mrp_production(osv.osv):
|
|||
result[prod.id] = prod.date_planned[:10]
|
||||
return result
|
||||
|
||||
def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
|
||||
""" Finds reference sale order for production order.
|
||||
@param field_names: Names of fields.
|
||||
@param arg: User defined arguments
|
||||
@return: Dictionary of values.
|
||||
"""
|
||||
res = {}
|
||||
for f in field_names:
|
||||
for order_id in ids:
|
||||
res[order_id] = {f:False}
|
||||
return res
|
||||
|
||||
_columns = {
|
||||
'name': fields.char('Reference', size=64, required=True),
|
||||
'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this production order request."),
|
||||
|
@ -526,8 +514,6 @@ class mrp_production(osv.osv):
|
|||
'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
|
||||
'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
|
||||
|
||||
'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'),
|
||||
'sale_ref': fields.function(_ref_calc, method=True, multi='sale_ref', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
|
||||
'company_id': fields.many2one('res.company','Company',required=True),
|
||||
}
|
||||
_defaults = {
|
||||
|
|
|
@ -640,8 +640,6 @@
|
|||
<field name="date_finnished"/>
|
||||
<field name="picking_id" groups="base.group_extended"/>
|
||||
<field name="move_prod_id" groups="base.group_extended"/>
|
||||
<field name="sale_name" groups="base.group_extended"/>
|
||||
<field name="sale_ref" groups="base.group_extended"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
import sale
|
||||
import stock
|
||||
import product
|
||||
#import mrp
|
||||
import wizard
|
||||
import report
|
||||
import company
|
||||
|
|
|
@ -1,68 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||
# $Id$
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU 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 General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import osv, fields
|
||||
|
||||
class mrp_production(osv.osv):
|
||||
|
||||
_inherit = 'mrp.production'
|
||||
|
||||
def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context={}):
|
||||
if not field_names:
|
||||
field_names=[]
|
||||
res = {}
|
||||
for id in ids:
|
||||
res[id] = {}.fromkeys(field_names, False)
|
||||
for f in field_names:
|
||||
field_name = False
|
||||
if f=='sale_name':
|
||||
field_name = 'name'
|
||||
if f=='sale_ref':
|
||||
field_name = 'client_order_ref'
|
||||
for key, value in self._get_sale_ref(cr, uid, ids, field_name).items():
|
||||
res[key][f] = value
|
||||
return res
|
||||
|
||||
def _get_sale_ref(self, cr, uid, ids, field_name=False):
|
||||
move_obj=self.pool.get('stock.move')
|
||||
|
||||
def get_parent_move(move_id):
|
||||
move = move_obj.browse(cr, uid, move_id)
|
||||
if move.move_dest_id:
|
||||
return get_parent_move(move.move_dest_id.id)
|
||||
return move_id
|
||||
|
||||
productions = self.read(cr, uid, ids, ['id','move_prod_id'])
|
||||
res={}
|
||||
for production in productions:
|
||||
res[production['id']] = False
|
||||
if production.get('move_prod_id',False):
|
||||
parent_move_line = get_parent_move(production['move_prod_id'][0])
|
||||
if parent_move_line:
|
||||
move = move_obj.browse(cr,uid,parent_move_line)
|
||||
if field_name == 'name':
|
||||
res[production['id']] = move.sale_line_id and move.sale_line_id.order_id.name or False
|
||||
if field_name=='client_order_ref':
|
||||
res[production['id']] = move.sale_line_id and move.sale_line_id.order_id.client_order_ref or False
|
||||
return res
|
||||
|
||||
mrp_production()
|
Loading…
Reference in New Issue