odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] some comments in the code 

bzr revid: fp@tinyerp.com-20130701090923-o1z2lq8l8k1sh7dq
This commit is contained in:
Fabien Pinckaers 2013-07-01 11:09:23 +02:00
parent e0a5a141de
commit da62a6a8d5
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/procurement/procurement.py
View File

@ -99,7 +99,7 @@ class procurement_order(osv.osv):
'date_planned': fields.datetime('Scheduled date', required=True, select=True),
'group_id':fields.many2one('procurement.group', 'Procurement Requisition'),
'rule_id': fields.many2one('procurement.rule', 'Rule'),
'rule_id' :fields.many2one('procurement.rule', 'Rule'),
'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
@ -151,8 +151,10 @@ class procurement_order(osv.osv):
self.write(cr, uid, [procurement.id], {'rule_id', rule.id}, context=context)
procurement.refresh()
self._run(cr, uid, procurement, context=context or {})
result = True
else:
self.message_post(cr, uid, [procurement.id], body=_('No rule matching this procurement'), context=context)
result = False
else:
result = True
if result:

18
addons/stock/stock.py
View File

@ -186,6 +186,7 @@ class stock_quant(osv.osv):
toreserve.append(quant.id)
return self.write(cr, uid, toreserve, {'reservation_id': move.id}, context=context)
# add location_dest_id in parameters (False=use the desitnation of the move)
def quants_move(self, cr, uid, quants, move, context=None):
for quant,qty in quants:
location_from = quant and quant.location_id
@ -207,22 +208,27 @@ class stock_quant(osv.osv):
self._account_entry_move(cr, uid, quant, location_from, location_to, move, context=context)
# FP Note: TODO: implement domain preference that tries to retrieve first with this domain
# This will be used for putaway strategies
# This will be used for reservation
def quants_get(self, cr, uid, location, product, qty, domain=None, domain_preference=[], context=None):
"""
Use the removal strategies of product to search for the correct quants
If you inherit, put the super at the end of your method.
:location_id: child_of this location_id
:product_id: id of product
:qty in UoM of product
:lot_id NOT USED YET !
"""
result= []
# for domain2 in domain_preference:
# result = self._quants_get(cr, uid, location, product, qty, domain+domain2, context=context)
# qty = remaining quants qty - sum(result)
domain = domain or [('qty','>',0.0)]
removal_strategy = self.pool.get('stock.location').get_removal_strategy(cr, uid, location, product, context=context) or 'fifo'
if removal_strategy=='fifo':
result = self._quants_get_fifo(cr, uid, location, product, qty, domain, context=context)
result += self._quants_get_fifo(cr, uid, location, product, qty, domain, context=context)
elif removal_strategy=='lifo':
result = self._quants_get_lifo(cr, uid, location, product, qty, domain, context=context)
result += self._quants_get_lifo(cr, uid, location, product, qty, domain, context=context)
else:
raise osv.except_osv(_('Error!'),_('Removal strategy %s not implemented.' % (removal_strategy,)))
return result
@ -302,6 +308,7 @@ class stock_quant(osv.osv):
# FP Note: this is where we should post accounting entries for adjustment
def _price_update(self, cr, uid, quant, newprice, context=None):
self.write(cr, uid, [quant.id], {'cost': newprice}, context=context)
# TODO: generate accounting entries
#
# Implementation of removal strategies
@ -1597,6 +1604,7 @@ class stock_move(osv.osv):
'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", states={'done': [('readonly', True)]}),
'date_expected': fields.datetime('Scheduled Date', states={'done': [('readonly', True)]},required=True, select=True, help="Scheduled date for the processing of this move"),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}),
# TODO: improve store to add dependency on product UoM
'product_qty': fields.function(_quantity_normalize, type='float', store=True, string='Quantity',
digits_compute=dp.get_precision('Product Unit of Measure'),
help='Quantity in the default UoM of the product'),
@ -2062,6 +2070,10 @@ class stock_move(osv.osv):
self.action_confirm(cr, uid, todo, context=context)
qty = move.product_qty
# for qty, location_id in move_id.prefered_location_ids:
# quants = quant_obj.quants_get(cr, uid, move.location_id, move.product_id, qty, context=context)
# quant_obj.quants_move(cr, uid, quants, move, location_dest_id, context=context)
# should replace the above 2 lines
quants = quant_obj.quants_get(cr, uid, move.location_id, move.product_id, qty, context=context)
quant_obj.quants_move(cr, uid, quants, move, context=context)

22
addons/stock_location/stock_location.py
View File

@ -196,16 +196,20 @@ class stock_move(osv.osv):
'cancel_cascade': fields.boolean('Cancel Cascade', help='If checked, when this move is cancelled, cancel the linked move too'),
'putaway_ids': fields.one2many('stock.move.putaway', 'move_id', 'Put Away Suggestions')
}
# TODO: reimplement this
def _pull_apply(self, cr, uid, moves, context):
for move in moves:
for route in move.product_id.route_ids:
found = False
for rule in route.pull_ids:
if rule.location_id.id == move.location_id.id:
self.pool.get('procurement.rule')._apply(cr, uid, rule, move, context=context)
found = True
break
if found: break
# Create a procurement is MTO on stock.move
# Call _assign on procurement
#for move in moves:
# for route in move.product_id.route_ids:
# found = False
# for rule in route.pull_ids:
# if rule.location_id.id == move.location_id.id:
# self.pool.get('procurement.rule')._apply(cr, uid, rule, move, context=context)
# found = True
# break
# if found: break
return True
def _push_apply(self, cr, uid, moves, context):