Moved Purchasing Number to Save Only On Commit True
Added to ensure using full URI
Added Updating Number to include Encapsulating Logic
Merge branch 'hotfix-2.0.4' into develop