diff --git a/brewman/brewman/static/scripts/issue.js b/brewman/brewman/static/scripts/issue.js
index 5985eaa1..65c9aa86 100644
--- a/brewman/brewman/static/scripts/issue.js
+++ b/brewman/brewman/static/scripts/issue.js
@@ -140,7 +140,7 @@ var IssueCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', 'vou
 
     $scope.save = function () {
         if (angular.isDate($scope.voucher.Date)) {
-            $scope.voucher.Date = dateFilter($scope.info.Date, 'dd-MMM-yyyy');
+            $scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
         }
         $scope.voucher.$save({type: 'Issue'}, function (u, putResponseHeaders) {
             $scope.toasts.push({Type: 'Success', Message: ''});
diff --git a/brewman/brewman/static/scripts/payment.js b/brewman/brewman/static/scripts/payment.js
index c290dea2..ca2439de 100644
--- a/brewman/brewman/static/scripts/payment.js
+++ b/brewman/brewman/static/scripts/payment.js
@@ -75,7 +75,7 @@ var PaymentCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'voucher
 
     $scope.save = function () {
         if (angular.isDate($scope.voucher.Date)) {
-            $scope.voucher.Date = dateFilter($scope.info.Date, 'dd-MMM-yyyy');
+            $scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
         }
         $scope.voucher.$save({type: 'Payment'}, function (u, putResponseHeaders) {
             $scope.toasts.push({Type: 'Success', Message: ''});
diff --git a/brewman/brewman/static/scripts/purchase-return.js b/brewman/brewman/static/scripts/purchase-return.js
index 21eea41d..417864df 100644
--- a/brewman/brewman/static/scripts/purchase-return.js
+++ b/brewman/brewman/static/scripts/purchase-return.js
@@ -82,7 +82,7 @@ var PurchaseReturnCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', '
 
     $scope.save = function () {
         if (angular.isDate($scope.voucher.Date)) {
-            $scope.voucher.Date = dateFilter($scope.info.Date, 'dd-MMM-yyyy');
+            $scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
         }
         $scope.voucher.$save({type: 'Purchase Return'}, function (u, putResponseHeaders) {
             $scope.toasts.push({Type: 'Success', Message: ''});
diff --git a/brewman/brewman/static/scripts/purchase.js b/brewman/brewman/static/scripts/purchase.js
index 9b89e725..841c1a80 100644
--- a/brewman/brewman/static/scripts/purchase.js
+++ b/brewman/brewman/static/scripts/purchase.js
@@ -87,7 +87,7 @@ var PurchaseCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'vouche
 
     $scope.save = function () {
         if (angular.isDate($scope.voucher.Date)) {
-            $scope.voucher.Date = dateFilter($scope.info.Date, 'dd-MMM-yyyy');
+            $scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
         }
         $scope.voucher.$save({type: 'Purchase'}, function (u, putResponseHeaders) {
             $scope.toasts.push({Type: 'Success', Message: ''});
@@ -176,9 +176,8 @@ var PurchaseCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal', 'vouche
             deferred.resolve(result);
         });
         return deferred.promise;
-    }
-
-}]
+    };
+}];
 
 PurchaseCtrl.resolve = {
     voucher: ['$q', '$route', 'Voucher', function ($q, $route, Voucher) {
@@ -205,7 +204,7 @@ var PurchaseModalCtrl = ['$scope', '$modalInstance', '$q', 'edit', 'Product', fu
         $scope.edit.Quantity = Number(edit.Quantity);
         $scope.edit.Tax = ($scope.edit.Tax) ? Number($scope.edit.Tax) : 0;
         $scope.edit.Discount = ($scope.edit.Discount) ? Number($scope.edit.Discount) : 0;
-        $scope.edit.Rate = Number($scope.edit.Product.Price);
+        $scope.edit.Rate = Number($scope.edit.Rate);
         $scope.edit.Amount = $scope.edit.Quantity * $scope.edit.Rate * (1 + $scope.edit.Tax) * (1 - $scope.edit.Discount);
         $modalInstance.close($scope.edit);
     };
diff --git a/brewman/brewman/static/scripts/receipt.js b/brewman/brewman/static/scripts/receipt.js
index c6c4e40b..a0c54199 100644
--- a/brewman/brewman/static/scripts/receipt.js
+++ b/brewman/brewman/static/scripts/receipt.js
@@ -75,7 +75,7 @@ var ReceiptCtrl = ['$scope', '$routeParams', '$location', '$q', 'dateFilter', '$
 
     $scope.save = function () {
         if (angular.isDate($scope.voucher.Date)) {
-            $scope.voucher.Date = dateFilter($scope.info.Date, 'dd-MMM-yyyy');
+            $scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
         }
         $scope.voucher.$save({type: 'Receipt'}, function (u, putResponseHeaders) {
             $scope.toasts.push({Type: 'Success', Message: ''});
diff --git a/brewman/brewman/static/scripts/salary-deduction.js b/brewman/brewman/static/scripts/salary-deduction.js
index bf2e36f5..3e1117f1 100644
--- a/brewman/brewman/static/scripts/salary-deduction.js
+++ b/brewman/brewman/static/scripts/salary-deduction.js
@@ -111,7 +111,7 @@ var SalaryDeductionCtrl = ['$scope', '$location', '$q', 'dateFilter', '$modal',
 
     $scope.save = function () {
         if (angular.isDate($scope.voucher.Date)) {
-            $scope.voucher.Date = dateFilter($scope.info.Date, 'dd-MMM-yyyy');
+            $scope.voucher.Date = dateFilter($scope.voucher.Date, 'dd-MMM-yyyy');
         }
         $scope.voucher.$save({type: 'Salary Deduction'}, function (u, putResponseHeaders) {
             $scope.toasts.push({Type: 'Success', Message: ''});
diff --git a/brewman/brewman/templates/angular_base.mako b/brewman/brewman/templates/angular_base.mako
index eb9db639..afbdc2a5 100644
--- a/brewman/brewman/templates/angular_base.mako
+++ b/brewman/brewman/templates/angular_base.mako
@@ -25,9 +25,9 @@
         }
     </style>
 
-    <script src="/js/mousetrap.min-1.4.5.js"></script>
+##    <script src="/js/mousetrap.min-1.4.5.js"></script>
     <script src="/js/jquery-2.0.2.min.js"></script>
-    <script src="/js/jquery-ui-1.10.3.custom.min.js"></script>
+##    <script src="/js/jquery-ui-1.10.3.custom.min.js"></script>
     <script src="/js/bootstrap.min-3.0.0.js"></script>
     <script src="/js/ace/ace.js"></script>
     <script src="/js/showdown.min.js"></script>