for changing fixtures i charge T&M. Too many times you find problems fixing them cost you time and money. let the customer pay for the work you do. if the customer wants to buy the fixtures -let them -just charge them for the time to assemble the fixtures. Make it clear that the understand thatT&M means no freebees. unless you feel like giving away your work.
