Merge branch 'master' into 'develop'

Master See merge request !117

Merge branch 'master' into 'develop'
Master See merge request !117
Eric Fernandez
2 parents 3fda033a8d 8ebdc368c8
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -993,6 +993,7 @@ angular.module(&#39;focaCrearNotaPedido&#39;).controller(&#39;notaPedidoCtrl&#39;,
                                 addArrayCabecera($scope.cabeceras);
                             });
                     }
+                    $scope.idLista = parseInt(notaPedido.idListaPrecio);
                 }
  
                 if (notaPedido.flete === 1) {
...	...	@@ -993,6 +993,7 @@ angular.module('focaCrearNotaPedido').controller('notaPedidoCtrl',
993	993	addArrayCabecera($scope.cabeceras);
994	994	});
995	995	}
	996	+ $scope.idLista = parseInt(notaPedido.idListaPrecio);
996	997	}
997	998
998	999	if (notaPedido.flete === 1) {