Merge branch 'master' into 'master'

Fuera signos monedas, sugerido en modal cheque See merge request !27

Merge branch 'master' into 'master'
Fuera signos monedas, sugerido en modal cheque See merge request !27
Jose Pinto
2 parents 2e874275e1 1e9c24f2d0
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/cobranza.html
@@ -280,7 +280,6 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
  
                     $scope.facturaTabla = cobranza.facturas;
                     $scope.cobrosTabla = cobranza.cobros;
-
                 });
             };
  
@@ -349,7 +348,13 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                         ariaLabelledBy: 'Carga de cheques',
                         templateUrl: 'modal-cheque.html',
                         controller: 'focaModalChequeController',
-                        size: 'lg'
+                        size: 'lg',
+                        resolve: {
+                            sugerido: function() {
+                                var sugerido = $scope.getTotalDeuda() + $scope.getTotalCobrado();
+                                return sugerido < 0 ? sugerido : null;
+                            }
+                        }
                     }
                 );
                 modalInstance.result.then(
@@ -385,7 +390,7 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                         resolve: {
                             sugerido: function() {
                                 var sugerido = $scope.getTotalDeuda() + $scope.getTotalCobrado();
-                                return sugerido < 0 ? sugerido : null ;
+                                return sugerido < 0 ? sugerido : null;
                             }
                         }
                     }
@@ -454,7 +459,7 @@ angular.module(&#39;focaCrearCobranza&#39;) .controller(&#39;cobranzaController&#39;,
                             });
                             $scope.$broadcast('addCabecera', {
                                 label: 'Cotizacion:',
-                                valor: cotizacion.VENDEDOR
+                                valor: $filter('number')(cotizacion.VENDEDOR, '2')
                             });
                         }
                     }, function() {
@@ -57,7 +57,7 @@
                                 <td
                                     class="col"
                                     ng-bind="(factura.IPA / cobranza.cotizacion.VENDEDOR) |
-                                        currency: cobranza.moneda.SIMBOLO : 4"></td>
+                                        number: 4"></td>
                                 <td class="text-center col-auto">
                                     <button
                                         class="btn btn-outline-light"
...	...	@@ -280,7 +280,6 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
280	280
281	281	$scope.facturaTabla = cobranza.facturas;
282	282	$scope.cobrosTabla = cobranza.cobros;
283		-
284	283	});
285	284	};
286	285
...	...	@@ -349,7 +348,13 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
349	348	ariaLabelledBy: 'Carga de cheques',
350	349	templateUrl: 'modal-cheque.html',
351	350	controller: 'focaModalChequeController',
352		- size: 'lg'
	351	+ size: 'lg',
	352	+ resolve: {
	353	+ sugerido: function() {
	354	+ var sugerido = $scope.getTotalDeuda() + $scope.getTotalCobrado();
	355	+ return sugerido < 0 ? sugerido : null;
	356	+ }
	357	+ }
353	358	}
354	359	);
355	360	modalInstance.result.then(
...	...	@@ -385,7 +390,7 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
385	390	resolve: {
386	391	sugerido: function() {
387	392	var sugerido = $scope.getTotalDeuda() + $scope.getTotalCobrado();
388		- return sugerido < 0 ? sugerido : null ;
	393	+ return sugerido < 0 ? sugerido : null;
389	394	}
390	395	}
391	396	}
...	...	@@ -454,7 +459,7 @@ angular.module('focaCrearCobranza') .controller('cobranzaController',
454	459	});
455	460	$scope.$broadcast('addCabecera', {
456	461	label: 'Cotizacion:',
457		- valor: cotizacion.VENDEDOR
	462	+ valor: $filter('number')(cotizacion.VENDEDOR, '2')
458	463	});
459	464	}
460	465	}, function() {
...	...	@@ -57,7 +57,7 @@
57	57	<td
58	58	class="col"
59	59	ng-bind="(factura.IPA / cobranza.cotizacion.VENDEDOR) \|
60		- currency: cobranza.moneda.SIMBOLO : 4"></td>
	60	+ number: 4"></td>
61	61	<td class="text-center col-auto">
62	62	<button
63	63	class="btn btn-outline-light"