Both should be fixed, unless you are a pro, or your breed's very existance depends on more puppies. We put down far too many good animals every year because people don't spay and neuter their family pets..
Not to mention that unneutered male dogs are aggressive, and account for the vast majority of dog-inflicted serious injuries and fatalities.