Work around None from getVariationBaseCategoryList and getVariationCategoryList. Do not use target_quantity if deliveries are invoices in mergeDeliveryList.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@976 20353a03-c40f-0410-a6d1-a30d3c3de9de