Fixing display of qty and rop on stock assembly form

and merges Ehuels's fix