Commit 5897a0b25484854359b85560a64371f4e464f6ff

Authored by Eric Fernandez
Exists in master and in 2 other branches develop, lab

Merge branch 'master' into 'develop'

Master

See merge request !9
src/js/controller.js
... ... @@ -75,7 +75,7 @@ angular.module('focaActivarHojaRuta')
75 75 {
76 76 ariaLabelledBy: '',
77 77 templateUrl: 'modal-remitos.html',
78   - controller: 'focaModalDetalleController',
  78 + controller: 'focaModalRemitosHojaRutaController',
79 79 resolve: {
80 80 hojasRutas: function () { return hojasRutas; },
81 81 },
src/js/controllerDetalle.js
1 1 angular.module('focaActivarHojaRuta')
2   - .controller('focaModalDetalleController', [
  2 + .controller('focaModalRemitosHojaRutaController', [
3 3 '$scope', '$timeout', '$uibModalInstance', 'focaModalService',
4 4 'focaActivarHojaRutaService','hojasRutas',
5 5 function ($scope, $timeout, $uibModalInstance, focaModalService,