API tools faq
paste
Advertisement
HC_

COLSEGPLA-1383

HC_
Mar 11th, 2019
97
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 20.43 KB | None | 0 0
raw download clone embed print report
  1. From https://github.com/vsaldana/SolutoCS_Oficial_SG
  2. 25d281d..5c03f68 master -> origin/master
  3. Updating 25d281d..5c03f68
  4. Fast-forward
  5. .../controllers/AdministracionContratos.php | 2 +-
  6. .../controllers/AdministracionContratos_Ajax.php | 2 +-
  7. application/controllers/Asegurados.php | 2 +-
  8. application/controllers/AuxiliaresOPS.php | 2 +-
  9. application/controllers/Aws.php | 2 +-
  10. application/controllers/AwsAjax.php | 2 +-
  11. application/controllers/Beneficio.php | 2 +-
  12. application/controllers/C1266.php | 2 +-
  13. application/controllers/C2131.php | 2 +-
  14. application/controllers/CORE/Asegurados.php | 2 +-
  15. application/controllers/CORE/Coberturas.php | 2 +-
  16. application/controllers/CORE/Home.php | 2 +-
  17. application/controllers/CORE/Polizas.php | 2 +-
  18. application/controllers/CORE/Productos.php | 2 +-
  19. application/controllers/Campanas.php | 2 +-
  20. application/controllers/Chat.php | 2 +-
  21. application/controllers/Cobranza.php | 2 +-
  22. .../CobranzaColectivo/BAC/BacController.php | 2 +-
  23. application/controllers/CobranzasColectivos.php | 2 +-
  24. .../CobranzasColectivos_Facturacion.php | 2 +-
  25. .../CobranzasColectivos_Movimientos.php | 2 +-
  26. application/controllers/CobranzasIndividuales.php | 2 +-
  27. application/controllers/ComisionesCorredores.php | 2 +-
  28. application/controllers/ComisionesIndividuales.php | 2 +-
  29. application/controllers/Comunicaciones.php | 2 +-
  30. application/controllers/ControlTareas.php | 2 +-
  31. application/controllers/Dashboard.php | 2 +-
  32. application/controllers/Dashboard_Ajax.php | 2 +-
  33. application/controllers/Excel.php | 2 +-
  34. application/controllers/FacturacionIndividual.php | 2 +-
  35. application/controllers/Feriados.php | 2 +-
  36. application/controllers/Formularios.php | 2 +-
  37. .../controllers/FormulariosColmenaSeguros.php | 2 +-
  38. .../controllers/FormulariosColmenaSeguros_Ajax.php | 2 +-
  39. application/controllers/Formularios_Ajax.php | 2 +-
  40. application/controllers/General.php | 2 +-
  41. application/controllers/GeneralAjax.php | 2 +-
  42. application/controllers/GestionadorGastos.php | 2 +-
  43. application/controllers/GestorDocumental.php | 2 +-
  44. application/controllers/Indicadores.php | 2 +-
  45. application/controllers/InformesCallCenter.php | 2 +-
  46. application/controllers/InformesCallCenterAjax.php | 2 +-
  47. application/controllers/Inicio.php | 2 +-
  48. application/controllers/Interfaces.php | 2 +-
  49. application/controllers/InterfacesAjax.php | 2 +-
  50. application/controllers/Interfaces_1.php | 2 +-
  51. application/controllers/Interfaces_iAxis.php | 2 +-
  52. application/controllers/Interfaces_iAxisAjax.php | 2 +-
  53. application/controllers/InventarioPolizas.php | 2 +-
  54. application/controllers/Kpi.php | 2 +-
  55. application/controllers/Login.php | 2 +-
  56. application/controllers/Menu.php | 2 +-
  57. application/controllers/MontosAltosSiniestros.php | 2 +-
  58. .../controllers/MontosAltosSiniestros_Ajax.php | 2 +-
  59. application/controllers/Perfil.php | 2 +-
  60. application/controllers/Plantillas.php | 2 +-
  61. application/controllers/PlantillasAjax.php | 2 +-
  62. application/controllers/PlantillasColectivo.php | 2 +-
  63. .../controllers/PlantillasColectivoAjax.php | 2 +-
  64. application/controllers/ProcesoCaducacion.php | 2 +-
  65. application/controllers/ProcesoCaducacion_Ajax.php | 2 +-
  66. application/controllers/ProcesoCierre.php | 2 +-
  67. application/controllers/Siniestro.php | 2 +-
  68. application/controllers/Siniestros.php | 2 +-
  69. application/controllers/Sol_AWS.php | 2 +-
  70. application/controllers/Soluclientes.php | 2 +-
  71. application/controllers/Soluticket.php | 2 +-
  72. application/controllers/SoluticketAjax.php | 2 +-
  73. application/controllers/Soluticket_Reportes.php | 2 +-
  74. .../controllers/SolutoAPI/MY_RestController.php | 2 +-
  75. .../SolutoAPI/SolutoPDF/Formularios.php | 2 +-
  76. .../SolutoPDF/FormulariosColmenaSeguros.php | 2 +-
  77. .../SolutoPDF/config/Formularios_config.php | 2 +-
  78. .../SolutoPDF/config/Formularios_model.php | 2 +-
  79. application/controllers/iAxis.php | 2 +-
  80. .../iAxisController/InventarioPolizas.php | 2 +-
  81. .../iAxisController/InventarioPolizas_1.php | 2 +-
  82. .../controllers/iAxisController/Recaudaciones.php | 2 +-
  83. application/controllers/index.html | 2 +-
  84. application/controllers/neitcom.php | 2 +-
  85. application/models/Cobranzascol_model.php | 486 +++++++++++-
  86. .../views/cobranzascol/movimientos/mantenedor.php | 242 ++++++
  87. .../cobranzascol/movimientos/mantenedor_banco.php | 169 ++++
  88. .../cobranzascol/movimientos/movimiento_editar.php | 859 +++++++++++++++++++++
  89. .../cobranzascol/movimientos/movimiento_lista.php | 131 ++++
  90. .../cobranzascol/movimientos/pre_movimiento.php | 418 ++++++++++
  91. application/views/menu/cobranzascol/_menuizq.php | 246 ++----
  92. 87 files changed, 2460 insertions(+), 251 deletions(-)
  93. create mode 100644 application/views/cobranzascol/movimientos/mantenedor.php
  94. create mode 100644 application/views/cobranzascol/movimientos/mantenedor_banco.php
  95. create mode 100644 application/views/cobranzascol/movimientos/movimiento_editar.php
  96. create mode 100644 application/views/cobranzascol/movimientos/movimiento_lista.php
  97. create mode 100644 application/views/cobranzascol/movimientos/pre_movimiento.php
  98.  
  99. _________________________________________________________________________
  100. Updating 52d24f3..7f776a6
  101. Fast-forward
  102. application/controllers/Aws.php | 2 +-
  103. application/controllers/AwsAjax.php | 2 +-
  104. application/controllers/General.php | 2 +-
  105. application/controllers/GeneralAjax.php | 2 +-
  106. application/controllers/GestionadorGastos.php | 2 +-
  107. application/controllers/Indicadores.php | 2 +-
  108. application/controllers/Inicio.php | 2 +-
  109. application/controllers/Interfaces.php | 2 +-
  110. application/controllers/InterfacesAjax.php | 2 +-
  111. application/controllers/Interfaces_iAxis.php | 2 +-
  112. application/controllers/Interfaces_iAxisAjax.php | 2 +-
  113. application/controllers/Login.php | 2 +-
  114. application/controllers/Menu.php | 2 +-
  115. application/controllers/Tools.php | 2 +-
  116. application/controllers/iAxis.php | 2 +-
  117. application/controllers/iAxisController/InventarioPolizas.php | 2 +-
  118. application/controllers/iAxisController/InventarioPolizas_1.php | 2 +-
  119. application/controllers/iAxisController/Recaudaciones.php | 2 +-
  120. application/controllers/index.html | 2 +-
  121. application/core/index.html | 2 +-
  122. .../forms/AdministracionContratos/AdministracionContratos_form.php | 2 +-
  123. application/forms/FormFactory.php | 2 +-
  124. application/forms/GeneralValidations.php | 2 +-
  125. application/forms/Login/Login_form.php | 2 +-
  126. application/forms/Login/Login_form_validation.php | 2 +-
  127. application/forms/Usuarios/Usuarios_form.php | 2 +-
  128. application/forms/Usuarios/Usuarios_form_validation.php | 2 +-
  129. application/helpers/AWS_helper.php | 2 +-
  130. application/helpers/bootstrap_helper.php | 2 +-
  131. application/helpers/core_helper.php | 2 +-
  132. application/helpers/datatables_helper.php | 2 +-
  133. application/helpers/general_helper.php | 2 +-
  134. application/helpers/index.html | 2 +-
  135. application/models/AdministracionContratos_model.php | 2 +-
  136. application/models/Aws_model.php | 2 +-
  137. application/models/EntityModels/ComisionesPorEjecutivo_model.php | 2 +-
  138. application/models/EntityModels/PeriodoSometimiento_model.php | 2 +-
  139. application/models/EntityModels/Persistencia_model.php | 2 +-
  140. application/models/EntityModels/Proveedores_model.php | 2 +-
  141. application/models/EntityModels/Roles_model.php | 2 +-
  142. application/models/EntityModels/Usuario_model.php | 2 +-
  143. application/models/General_model.php | 2 +-
  144. application/models/Indicadores_model.php | 2 +-
  145. application/models/Interfaces_iAxis_model.php | 2 +-
  146. application/models/Interfaces_model.php | 2 +-
  147. application/models/Login_model.php | 2 +-
  148. application/models/Menu_model.php | 2 +-
  149. application/models/Soluticket_model.php | 2 +-
  150. application/models/iAxisModels/InventarioPolizas_model.php | 2 +-
  151. application/models/iAxisModels/Recaudaciones_model.php | 2 +-
  152. application/models/iAxis_model.php | 2 +-
  153. application/models/index.html | 2 +-
  154. application/views/Aws/Email/bitacora_correos.php | 2 +-
  155. application/views/Aws/Files/link_expirado.php | 2 +-
  156. application/views/_footer.php | 2 +-
  157. application/views/_head.php | 2 +-
  158. application/views/_header.php | 2 +-
  159. application/views/_layout.php | 2 +-
  160. application/views/_loading.php | 2 +-
  161. application/views/_menuizq.php | 2 +-
  162. application/views/errors/cli/error_404.php | 2 +-
  163. application/views/errors/cli/error_db.php | 2 +-
  164. application/views/errors/cli/error_exception.php | 2 +-
  165. application/views/errors/cli/error_general.php | 2 +-
  166. application/views/errors/cli/error_php.php | 2 +-
  167. application/views/errors/cli/index.html | 2 +-
  168. application/views/errors/html/error_403.php | 2 +-
  169. application/views/errors/html/error_404.php | 2 +-
  170. application/views/errors/html/error_db.php | 2 +-
  171. application/views/errors/html/error_exception.php | 2 +-
  172. application/views/errors/html/error_general.php | 2 +-
  173. application/views/errors/html/error_php.php | 2 +-
  174. application/views/errors/html/index.html | 2 +-
  175. application/views/errors/index.html | 2 +-
  176. application/views/iAxis/InventarioPolizas/InventarioPolizas.php | 2 +-
  177. application/views/iAxis/agenteSupervisor/agenteSupervisor_index.php | 2 +-
  178. application/views/iAxis/baseDoctor/baseDoctor_index.php | 2 +-
  179. application/views/iAxis/cliente/cliente_index.php | 2 +-
  180. application/views/iAxis/cobcol/cobcol1/cobcol_index.php | 2 +-
  181. application/views/iAxis/cobcol/cobcol2/cobcol_index.php | 2 +-
  182. application/views/iAxis/cobcol/cobcol3/cobcol_index.php | 2 +-
  183. application/views/iAxis/deporteSeguro/deporte_index.php | 2 +-
  184. application/views/iAxis/facturacionIndividual/facturacion_index.php | 2 +-
  185. application/views/iAxis/faraggi/colectivo/colectivo_index.php | 2 +-
  186. application/views/iAxis/faraggi/individual/individual_index.php | 2 +-
  187. application/views/iAxis/faraggi_novedades/colectivo/colectivo_index.php | 2 +-
  188. .../views/iAxis/faraggi_novedades/individual/individual_index.php | 2 +-
  189. application/views/iAxis/fullIsapre/fullIsapre_index.php | 2 +-
  190. application/views/iAxis/fullOpv/fullOpv_index.php | 2 +-
  191. application/views/iAxis/gedox/gedox_index.php | 2 +-
  192. application/views/iAxis/imedDental/imedDental_index.php | 2 +-
  193. application/views/iAxis/kpi/kpi_index.php | 2 +-
  194. application/views/iAxis/libro/produccion/produccion_index.php | 2 +-
  195. application/views/iAxis/libro/ultimaSituacion/ultimaSituacion_index.php | 2 +-
  196. .../views/iAxis/libroUltimaSituacionColectivo/libroColectivo_index.php | 2 +-
  197. .../iAxis/libroUltimaSituacionIndividual/libroIndividual_index.php | 2 +-
  198. application/views/iAxis/masProteccion/proteccion_bitacora.php | 2 +-
  199. application/views/iAxis/masProteccion/proteccion_index.php | 2 +-
  200. application/views/iAxis/neitcom/neitcom_diario.php | 2 +-
  201. application/views/iAxis/neitcom/neitcom_index.php | 2 +-
  202. application/views/iAxis/pdi/pdi_bitacora.php | 2 +-
  203. application/views/iAxis/pdi/pdi_index.php | 2 +-
  204. application/views/iAxis/pharma/pharma_index.php | 2 +-
  205. application/views/iAxis/pharmamax/pharmamax_index.php | 2 +-
  206. application/views/iAxis/polizas/InventarioPolizas.php | 2 +-
  207. application/views/iAxis/producto/producto_index.php | 2 +-
  208. application/views/iAxis/reciboUltimaSituacion/_bitacora.php | 2 +-
  209. application/views/iAxis/reciboUltimaSituacion/reciboUltimaSituacion.php | 2 +-
  210. application/views/iAxis/siniestros/siniestros_index.php | 2 +-
  211. .../views/iAxis/tarjetaAltasCargas/colectivo/colectivo_index.php | 2 +-
  212. .../views/iAxis/tarjetaAltasCargas/individual/individual_index.php | 2 +-
  213. application/views/iAxis/tarjetaVigente/colectivo/colectivo_index.php | 2 +-
  214. .../views/iAxis/tarjetaVigente/colectivo/colectivo_nuevo_producto.php | 2 +-
  215. application/views/iAxis/tarjetaVigente/individual/individual_index.php | 2 +-
  216. .../views/iAxis/txtLibroRecaudacion/txtLibroRecaudacion_index.php | 2 +-
  217. application/views/index.php | 2 +-
  218. application/views/index_.html | 2 +-
  219. application/views/indicadores/indicadores_form.php | 2 +-
  220. application/views/indicadores/indicadores_home.php | 2 +-
  221. application/views/indicadores/indicadores_index.php | 2 +-
  222. application/views/indicadores/indicadores_modal.php | 2 +-
  223. application/views/interfaces/_bitacora.php | 2 +-
  224. application/views/interfaces/cobcol_full.php | 2 +-
  225. application/views/interfaces/cobcol_movimientos.php | 2 +-
  226. application/views/interfaces/cobcol_reporte_susc.php | 2 +-
  227. application/views/interfaces/tkt_definiciones.php | 2 +-
  228. application/views/interfaces/tkt_full.php | 2 +-
  229. application/views/interfaces/wfi_bitacora.php | 2 +-
  230. application/views/interfaces/wfi_cargamasiva.php | 2 +-
  231. application/views/interfaces/wfi_cotizador.php | 2 +-
  232. application/views/interfaces/wfi_full.php | 2 +-
  233. application/views/interfaces/wfi_reporte_kpi.php | 2 +-
  234. application/views/login.php | 2 +-
  235. application/views/maintenance.php | 2 +-
  236. application/views/menu/administracionContratos/_menuizq.php | 2 +-
  237. application/views/menu/auxiliares_ops/_menuizq.php | 2 +-
  238. application/views/menu/c1266/_menuizq.php | 2 +-
  239. application/views/menu/c2131/_menuizq.php | 2 +-
  240. application/views/menu/campanas/_menuizq.php | 2 +-
  241. application/views/menu/formularios/_menuizq.php | 2 +-
  242. application/views/menu/general/_menuizq.php | 2 +-
  243. application/views/menu/gestionadorGastos/_menuizq.php | 2 +-
  244. application/views/menu/informescallcenter/_menuizq.php | 2 +-
  245. application/views/menu/interfaces/_menuizq.php | 2 +-
  246. application/views/menu/interfaces_iaxis/_menuizq.php | 2 +-
  247. application/views/menu/kpi/_menuizq.php | 2 +-
  248. application/views/menu/parametrosSistema/_menuizq.php | 2 +-
  249. application/views/menu/perfil/_menuizq.php | 2 +-
  250. application/views/menu/plantillas/_menuizq.php | 2 +-
  251. application/views/menu/reportes/_menuizq.php | 2 +-
  252. application/views/menu/usuario/_menuizq.php | 2 +-
  253. application/views/parametros/par_casperlog.php | 2 +-
  254. application/views/parametros/par_cilog.php | 2 +-
  255. application/views/parametros/par_definicion.php | 2 +-
  256. application/views/parametros/par_definicion_modalagregar.php | 2 +-
  257. application/views/parametros/par_definicion_modaleditar.php | 2 +-
  258. application/views/parametros/par_fechahora.php | 2 +-
  259. application/views/parametros/par_hotfix.php | 2 +-
  260. application/views/parametros/par_hotfix_modal.php | 2 +-
  261. application/views/parametros/par_iislog.php | 2 +-
  262. application/views/parametros/par_noticia_form.php | 2 +-
  263. application/views/parametros/par_noticias.php | 2 +-
  264. application/views/parametros/par_noticias_home.php | 2 +-
  265. application/views/parametros/par_noticias_modal.php | 2 +-
  266. application/views/parametros/par_noticias_thumb.php | 2 +-
  267. application/views/parametros/par_noticias_uploadFile.php | 2 +-
  268. application/views/parametros/par_proveedores.php | 2 +-
  269. application/views/parametros/par_sesiones_dia.php | 2 +-
  270. application/views/parametros/par_timeline.php | 2 +-
  271. application/views/parametros/par_uf.php | 2 +-
  272. application/views/parametros/par_uf_modalagregar.php | 2 +-
  273. application/views/parametros/par_uf_modaleditar.php | 2 +-
  274. application/views/parametros/par_usuarios.php | 2 +-
  275. application/views/parametros/par_usuarios_query.php | 2 +-
  276. application/views/parametros/par_valor.php | 2 +-
  277. application/views/parametros/par_valor_modalagregar.php | 2 +-
  278. application/views/parametros/par_valor_modaleditar.php | 2 +-
  279. application/views/profile.php | 2 +-
  280. application/views/remember.php | 2 +-
  281. application/views/viewArchivo/modal_general.php | 2 +-
  282. application/views/viewArchivo/tipoArchivo.php | 2 +-
  283. application/views/viewArchivo/viewArchivo.php | 2 +-
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!