precompromiso culminado
Merge branch 'master' of E:\erp ultimo\ERP_Quipucamayoc with conflicts.
Merge remote-tracking branch 'origin/master'