diff --git a/src/js/controller.js b/src/js/controller.js
index e6b6d54..2d96f18 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -114,14 +114,16 @@ angular.module('focaCrearNotaPedido')
                             var newArt =
                             {
                                 id: 0,
-                                codigo: producto.FiltroSectorCodigo,
+                                codigo: producto.codigo,
+                                sector: producto.sector,
+                                descripcion: producto.descripcion,
                                 item: $scope.articulosTabla.length + 1,
                                 nombre: producto.descripcion,
-                                precio: producto.precio,
+                                precio: producto.precio.toFixed(2),
                                 costoUnitario: producto.costo,
                                 cantidad: 1
                             };
-                            $scope.articulosTabla.unshift(newArt);
+                            $scope.articuloACargar = newArt;
                         }, function() {
                             // funcion ejecutada cuando se cancela el modal
                         }
@@ -223,6 +225,7 @@ angular.module('focaCrearNotaPedido')
                     modalInstance.result.then(
                         function(precioCondicion) {
                             $scope.notaPedido.precioCondicion = precioCondicion.nombre;
+                            idLista = precioCondicion.idListaPrecio;
                         }, function() {
 
                         }
@@ -248,6 +251,12 @@ angular.module('focaCrearNotaPedido')
                         );
                     }
                 };
+                $scope.agregarATabla = function(key) {
+                    if(key === 13) {
+                        $scope.articulosTabla.unshift($scope.articuloACargar);
+                        $scope.articuloACargar = undefined;
+                    }
+                };
             }
         ]
     )
diff --git a/src/views/nota-pedido.html b/src/views/nota-pedido.html
index 53e40dc..8ad5b59 100644
--- a/src/views/nota-pedido.html
+++ b/src/views/nota-pedido.html
@@ -139,13 +139,12 @@
                     <tr>
                         <th>Sector</th>
                         <th>Código</th>
-                        <th>Descripción</th>
-                        <th>Cantidad</th>
+                        <th>Descripción</th>                       
                         <th>Precio Unitario</th>
+                        <th>Cantidad</th>
                         <th>SubTotal</th>
-                        <th></th>
                         <th>
-                            <button class="btn btn-outline-secondary selectable" style="float: right;" ng-click="show = !show">
+                            <button class="btn btn-outline-secondary selectable" style="float: right;" ng-click="show = !show; masMenos()" >
                                 <i class="fa fa-chevron-down" ng-hide="show" aria-hidden="true"></i>
                                 <i class="fa fa-chevron-up" ng-show="show" aria-hidden="true"></i>
                             </button>
@@ -153,51 +152,51 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr>
+                    <tr ng-show="!articuloACargar">
                         <td colspan="2"><input class="form-control" readonly ng-click="seleccionarArticulo()"></td>
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
-                        <td></td>
                     </tr>
-                    <tr>
-                        <td>1</td>
-                        <td>1</td>
-                        <td>Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit...</td>
-                        <td>{{10000 | number: 2}}</td>
-                        <td>{{1000000000 | currency:'$'}}</td>
-                        <td>{{1000000000 | currency:'$'}}</td>
-                        <td></td>
-                        <td class="text-center">
-                            <button class="btn btn-outline-secondary btn-sm" ng-click="quitarArticulo()">
-                                <i class="fa fa-trash"></i>
-                            </button>
-                        </td>
+                    <tr ng-show="articuloACargar">
+                        <td><input
+                                class="form-control"
+                                ng-model="articuloACargar.sector"
+                                readonly></td>
+                        <td><input
+                                class="form-control"
+                                ng-model="articuloACargar.codigo"
+                                readonly></td>
+                        <td><input
+                                class="form-control"
+                                ng-model="articuloACargar.descripcion"
+                                readonly></td>
+                        <td><input
+                                class="form-control"
+                                ng-model="articuloACargar.precio"
+                                readonly></td>
+                        <td><input
+                                class="form-control"
+                                type="number"
+                                min="1"
+                                value="1"
+                                ng-model="articuloACargar.cantidad"
+                                foca-focus="articuloACargar.cantidad == 1"
+                                ng-keypress="agregarATabla($event.keyCode)"></td>
+                        <td><input 
+                                class="form-control"                                
+                                ng-model="(articuloACargar.precio * articuloACargar.cantidad)"
+                                readonly></td>
                     </tr>
-                    <tr ng-show="show">
-                        <td>1</td>
-                        <td>2</td>
-                        <td>Lorem Ipsum</td>
-                        <td>1</td>
-                        <td>{{1000000000 | currency:'U$D'}}</td>
-                        <td>{{10 | currency:'$'}}</td>
-                        <td></td>
-                        <td class="text-center">
-                            <button class="btn btn-outline-secondary btn-sm" ng-click="quitarArticulo()">
-                                <i class="fa fa-trash"></i>
-                            </button>
-                        </td>
-                    </tr>
-                    <tr ng-show="show">
-                        <td>1</td>
-                        <td>2</td>
-                        <td>Lorem Ipsum</td>
-                        <td>1</td>
-                        <td>{{10 | currency:'$'}}</td>
-                        <td>{{10 | currency:'$'}}</td>
-                        <td></td>
+                    <tr ng-repeat="(key, articulo) in articulosTabla" ng-show="show || key == 0">
+                        <td ng-bind="articulo.sector"></td>
+                        <td ng-bind="articulo.codigo"></td>
+                        <td ng-bind="articulo.descripcion"></td>
+                        <td ng-bind="articulo.precio | currency:'$'"></td>
+                        <td><input ng-model="articulo.cantidad" class="form-control" type="number" min="1" value="1"></td>
+                        <td ng-bind="(articulo.precio * articulo.cantidad)"></td>
                         <td class="text-center">
                             <button class="btn btn-outline-secondary btn-sm" ng-click="quitarArticulo()">
                                 <i class="fa fa-trash"></i>
@@ -207,8 +206,8 @@
                 </tbody>
                 <tfoot>
                     <tr class="table-secondary">
-                        <td colspan="5"><b>Cantidad Items:</b> 3</td>
-                        <td colspan="3">{{30 | currency:'$'}}</td>
+                        <td colspan="5"><b>Cantidad Items:</b> <a ng-bind="articulosTabla.length"></a> </td>
+                        <td colspan="3">{{getSubTotal(articulosTabla[0].item) | currency:'$'}}</td>
                     </tr>
                 </tfoot>
             </table>