From your description, 1914 date and crest with cross, you have the remains of a Greek military Mannlicher-Schoenauer model 1903/14 in 6.5x54 M-Sch. You will find hints to gunsmithing in Frank de Haas: "Bolt Action Rifles". Spare parts are sometimes available from Numrich, pre-inletted and -shaped stocks from www.gunstocks.com , even Stutzen fl ones in many grades of wood. The British gunmakers, especially George Gibbs of Bristol, once imported complete rifles from the military production and sporterized them to various degrees. My own was restocked and resighted by Gibbs in 1905.

Your problem with the safety not turning to the safe position stems from that "gunsmith" exaggerating when he tried to weld on a low profile bolthandle. Though he removed the stripper clip guides and cut deep recesses into both the action rail and the stock, the bolt still cannot turn to the "fully closed" position.