|
|
@@ -24046,8 +24046,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.change.vendUU = data.vendUU;
|
|
|
$scope.change.apVendorName = data.receiveName;
|
|
|
$scope.change.vendUserUU = data.vendUserUU;
|
|
|
- $scope.change.newCurrency = data.currency;
|
|
|
- $scope.change.newPayments = data.payments;
|
|
|
+ $scope.change.newCurrency = data.currency != null ? data.currency :null;
|
|
|
+ $scope.change.newPayments = data.payments != null ? data.payments :null;
|
|
|
angular.forEach($scope.orderItems, function (item) {
|
|
|
$scope.change.orderChangeItems.push({
|
|
|
oldProductId: item.productId,
|
|
|
@@ -24057,10 +24057,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
oldPrice: item.price,
|
|
|
oldTaxrate: item.taxrate,
|
|
|
oldDelivery: item.delivery,
|
|
|
- newQty: item.qty,
|
|
|
- newPrice: item.price,
|
|
|
- newTaxrate: item.taxrate,
|
|
|
- newDelivery: item.delivery,
|
|
|
+ newQty: item.qty != null ? item.qty :null,
|
|
|
+ newPrice: item.price != null ? item.price :null,
|
|
|
+ newTaxrate: item.taxrate != null ? item.taxrate :null,
|
|
|
+ newDelivery: item.delivery != null ? item.delivery :null,
|
|
|
oldProduct: item.product
|
|
|
});
|
|
|
});
|