#121 changed 1 letter.
update
Merge branch 'master' of https://github.com/phreebooks/PhreeBooksERP.git

Conflicts:
	extensions/Modules/sku_pricer/classes/sku_pricer.php