Calcula precio de nuevo producto
Merge branch 'Calcular-precio' into development
merge conflict resuelto