Merge pull request #56 from ledgersmb/master

up to date
Merge pull request #57 from ehuelsmann/master

Merging in Erik's fix for my conditional
Stocking assemblies works, but for some reason qty is not displayed on assembly stocking screen, which is a workflow issue that needs to be corrected.

--HG--
extra : source : f980d0cd0bc0736d950fad9c4caba23241085ffa
Merge pull request #256 from einhverfr/master

fixes most outstanding issues with stocking assemblies
Fixing display of qty and rop on stock assembly form
Merge pull request #257 from einhverfr/master

Fixing display of qty and rop on stock assembly form
Merge pull request #55 from ledgersmb/master

sync over master branch