7.0 fix lp1025703 afe

redefine  _prepare_chained_picking in delivery to handle the new fields correctly. 

fixes https://bugs.launchpad.net/openobject-addons/+bug/1025703 (also reported as #367 on github)