Merge pull request #68 from ledgersmb/1.4

1.4
Fixing pricematrix vendor price handling

--HG--
extra : source : ae4301469edf7487fb5999cac8661bfa1de3e96b
Merge pull request #386 from einhverfr/1.4

1.4