Tweaks and fixes

• Another regression fix : f2 find part description filter broken when no franchise was selected. Caused by recent inclusion of secondary franchises. Now fixed
• New job based on estimates: would not pick up default discount from estimate. Now fixed