Merge pull request #1955 from einhverfr/1.4

do not call pricematrix on existing order/invoice, fixes #1954, also …
ledgersmb · Aug 2, 2016 · d5e616a · d5e616a
2 parents aa9e0e5 + 92ea8d0
commit d5e616a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/LedgerSMB/PriceMatrix.pm b/LedgerSMB/PriceMatrix.pm
@@ -112,6 +112,7 @@ sub price_matrix_query {
 
 sub price_matrix {
     my ( $pmh, $ref, $transdate, $decimalplaces, $form, $myconfig ) = @_;
+    return if $form->{id};
     my $customerprice;
     my $pricegroupprice;
     my $sellprice;
@@ -138,7 +139,6 @@ sub price_matrix {
             $ref->{sellprice} = $sellprice;
        } elsif ($form->{vendor_id}){
             $sellprice = $mref->{lastcost} || $ref->{sellprice};
-            die $sellprice;
             $ref->{sellprice} = $sellprice;    
        }
     }