Delivery & receipt note models updated for nested & calc