I take a 3rd, unlisted option.
We have a Jobtype of RepairPPM which is a hybrid job type, negating the need to raise two seperate jobs but triggering the system to advance the NextPPMDue date as necessary.
Generally speaking most equipment should have a full check out and tests post repair.
Hope that helps.
When reporting on location based servicing, which is the method Neil is using also, we scan for two things
PPM Undertaken Count = total of two job types (Location Based PPM, RepairPPM)
Repairs during service visit = total of two job types (Repair + RepairPPM) (Obviously using appropriate date filters)