Commit Graph

19 Commits

Author SHA1 Message Date
Christian cfbc1ccc6b conflictos target 2020-09-28 14:06:11 -05:00
Christian d7b11e1732 errores target 2020-09-28 13:57:09 -05:00
Christian 9fb9e5da61 errores con target 2020-09-28 13:56:14 -05:00
james ac6cc7c9ec Agendamientos 2020-09-28 13:09:26 -05:00
james 423ad06d8d Agendamientos 2020-09-28 13:04:26 -05:00
Christian ade3406b12 accion resource 2020-09-23 12:38:09 -05:00
Christian 274c40b59e Merge branch 'master' of http://157.245.125.231/QSoftTechnologies/werp-services 2020-09-14 21:25:44 -05:00
james bb76a879f3 Eliminacion contable 2020-09-14 09:59:53 -05:00
Christian 64f21fcfaa Merge branch 'master' of http://157.245.125.231/QSoftTechnologies/werp-services 2020-09-03 09:49:54 -05:00
Christian 28a8333a92 merge problem 2020-09-03 09:49:50 -05:00
james db1150dfec Cambios finales 2020-09-03 09:24:10 -05:00
james 2b2c59ab28 Cambios contables 2020-08-14 00:23:13 -05:00
james 3a0ca4f706 Merge cruales/cruales
Conflicts:
	src/main/java/com/qsoft/wmp/services/util/ServiceUtil.java
2020-08-04 11:02:29 -05:00
james 67a73c6309 Merge remote-tracking branch 'cruales/cruales' 2020-08-04 10:58:28 -05:00
Christian 636b8a4a49 error IOException 2020-08-03 09:09:56 -05:00
Christian 328424f285 Algunos temas de farmaEnlace 2020-07-28 14:35:15 -05:00
james b5ef6cffd8 Mejoras contabilidad 2020-07-16 13:41:24 -05:00
james 7dd9d28f69 Mejoras auditoria y secuencias 2020-07-02 11:22:44 -05:00
james 6f669ebb76 Cambios para notificacion 2020-06-23 09:27:09 -05:00