← Back to branch summary

~unifield-team/unifield-wm/us-826

« back to all changes in this revision

Viewing changes to stock_override/wizard/stock_partial_move.py

  • Committer: Olivier DOSSMANN
  • Date: 2012-09-10 12:47:41 UTC
  • mfrom: (1122 unifield-wm)
  • mto: This revision was merged to the branch mainline in revision 1133.
  • Revision ID: olivier@tempo-laptop-20120910124741-jwl0z433kaszn1ob
UF-1285 [MERGE] Last trunk lp:unifield-wm

Show diffs side-by-side

added added

removed removed

Lines of Context:
stock_override/wizard/stock_partial_move.py
86
86
            }
87
87
            
88
88
            moves_ids_final.append(move.id)
89
 
            if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
 
89
            if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average') and not move.location_dest_id.cross_docking_location_ok:
90
90
                partial_datas['move%s' % (move.id)].update({
91
91
                    'product_price' : p_moves[move.id].cost,
92
92
                    'product_currency': p_moves[move.id].currency.id,