Merge branch 'master' into 'develop'

Master See merge request !48

Merge branch 'master' into 'develop'
Master See merge request !48
Eric Fernandez
2 parents 260673de15 e62657fc2f
Showing 1 changed file Show diff stats
src/views/remito.html
@@ -94,7 +94,7 @@
                                     >
                                     <i
                                         class="selectable"
-                                        ng-click="idLista == -1 && cambioEdit(articulo, 'precio')"
+                                        ng-click="cambioEdit(articulo, 'precio')"
                                         ng-hide="articulo.editPrecio"
                                         ng-bind="articulo.precio | number: 4">
                                     </i>
@@ -148,9 +148,9 @@
                                 <td class="col text-right">
                                     <input
                                         class="form-control"
-                                        ng-value="articuloACargar.precio | number: 4"
+                                        ng-model="articuloACargar.precio"
                                         ng-show="idLista != -1"
-                                        readonly
+                                        ng-keypress="agregarATabla($event.keyCode)"
                                     >
                                     <input
                                         class="form-control"
...	...	@@ -94,7 +94,7 @@
94	94	>
95	95	<i
96	96	class="selectable"
97		- ng-click="idLista == -1 && cambioEdit(articulo, 'precio')"
	97	+ ng-click="cambioEdit(articulo, 'precio')"
98	98	ng-hide="articulo.editPrecio"
99	99	ng-bind="articulo.precio \| number: 4">
100	100	</i>
...	...	@@ -148,9 +148,9 @@
148	148	<td class="col text-right">
149	149	<input
150	150	class="form-control"
151		- ng-value="articuloACargar.precio \| number: 4"
	151	+ ng-model="articuloACargar.precio"
152	152	ng-show="idLista != -1"
153		- readonly
	153	+ ng-keypress="agregarATabla($event.keyCode)"
154	154	>
155	155	<input
156	156	class="form-control"