fix segv when editing a sale
Merge branch '1-0-stable' of github.com:ekylibre/erp into 1-0-stable

Conflicts:
	app/models/document_template.rb