Merge branch 'master' into 'develop'

Master See merge request !61

Merge branch 'master' into 'develop'
Master See merge request !61
Eric Fernandez
2 parents 1083a8005e 04f6f8a506
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/nota-pedido.html
@@ -571,7 +571,6 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                         total += arrayTempArticulos[i].precio * arrayTempArticulos[i].cantidad;
                     }
                 }
-
                 return parseFloat(total.toFixed(2));
             };
  
@@ -199,7 +199,7 @@
                                     <h3>Total:</h3>
                                 </td>
                                 <td class="table-celda-total text-right no-border-top" colspan="1">
-                                    <h3>{{getTotal() | currency: notaPedido.moneda.SIMBOLO}}</h3>
+                                    <h3>{{getTotal() | currency: notaPedido.cotizacion.moneda.SIMBOLO}}</h3>
                                 </td>
                                 <td class="text-right no-border-top">
                                     <button
@@ -389,7 +389,7 @@
                                     <h3>Total:</h3>
                                 </td>
                                 <td class="table-celda-total text-right no-border-top">
-                                    <h3>{{getTotal() | currency: notaPedido.moneda.SIMBOLO}}</h3>
+                                    <h3>{{getTotal() | currency: notaPedido.cotizacion.moneda.SIMBOLO}}</h3>
                                 </td>
                             </tr>
                         </tfoot>
...	...	@@ -571,7 +571,6 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
571	571	total += arrayTempArticulos[i].precio * arrayTempArticulos[i].cantidad;
572	572	}
573	573	}
574		-
575	574	return parseFloat(total.toFixed(2));
576	575	};
577	576
...	...	@@ -199,7 +199,7 @@
199	199	<h3>Total:</h3>
200	200	</td>
201	201	<td class="table-celda-total text-right no-border-top" colspan="1">
202		- <h3>{{getTotal() \| currency: notaPedido.moneda.SIMBOLO}}</h3>
	202	+ <h3>{{getTotal() \| currency: notaPedido.cotizacion.moneda.SIMBOLO}}</h3>
203	203	</td>
204	204	<td class="text-right no-border-top">
205	205	<button
...	...	@@ -389,7 +389,7 @@
389	389	<h3>Total:</h3>
390	390	</td>
391	391	<td class="table-celda-total text-right no-border-top">
392		- <h3>{{getTotal() \| currency: notaPedido.moneda.SIMBOLO}}</h3>
	392	+ <h3>{{getTotal() \| currency: notaPedido.cotizacion.moneda.SIMBOLO}}</h3>
393	393	</td>
394	394	</tr>
395	395	</tfoot>