No probs at all,
To be honest it sounds like whomever wrote the tender wants the moon on a stick! Typically however yes, what you'd be looking to do is survey for data but allow for the proposed VoIP usage with greater AP density and check for all the odd places people end up using phones [stairwells usually, not somewhere you'd normally have wireless data coverage by default but I've had coverage requested in toilets and changing rooms before!].
The location survey would really be for specific purposes - ie if they wanted to use location tags or track specific devices. Wireless location services has always been one of those solutions looking for a problem in my opinion. The only time I've really seen it successfully used is in hospitals. The general principle is that you place tracking tags on anything you want to keep tabs on and the systems uses the signal triangulation to let you know where it is. There are a variety of different systems for doing this and what they all have in common is they are extremely expensive for what ultimately is some maths and a database.
I would generally suggest that unless the client has a defined requirement for location services there would be no material advantage to surveying for location or deploying APs in a deployment viable for location tracking. [Ekahau, one of the leaders in vendor independent location services, will happily tell you that their system works with any deployment anyway - this might not be entirely true
In your circumstances you've got two real choices - do a traditional ap on a pole survey allowing for voice. Gauging the time for these is more art than science relying on past exerience more than anything. Alternatively you could look to deploy a wireless system technology like Meru Networks which has some technological advantages that mean you can get away with a survey performed by the software I mentioned earlier. There are certain partner barriers that may prevent that however pushing you towards the usual suspects.
Aerohive offer a free wifi planning tool at their website that's not bad if you wanted to do some virtual planning first. Feel free to PM me if you need/want to go into any more techincal detail that you can't do on an open forum.
Jake Greenland, CEng MIET.