Hewlett-Packard to expand partnership with SAP