Manually merging in pricematrix changes for ticket 1897245 because codebase is too far off for automatic merge

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2271 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 4 insertions, 4 deletions

diff --git a/LedgerSMB/IR.pm b/LedgerSMB/IR.pm
index d2ade36d..5167b079 100644
--- a/LedgerSMB/IR.pm
+++ b/LedgerSMB/IR.pm
@@ -1180,6 +1180,8 @@ sub retrieve_invoice {
         my $ptref;
 
         while ( $ref = $sth->fetchrow_hashref(NAME_lc) ) {
+            PriceMatrix::price_matrix( $pmh, $ref, '', $decimalplaces, $form,
+                $myconfig );
             $form->db_parse_numeric(sth=>$sth, hashref=>$ref);
             $ref->{qty} *= -1 if $form->{reverse};
             my ($dec) = ( $ref->{fxsellprice} =~ /\.(\d+)/ );
@@ -1204,8 +1206,6 @@ sub retrieve_invoice {
               $form->round_amount(
                 $ref->{fxsellprice} * $form->{ $form->{currency} },
                 $decimalplaces );
-            PriceMatrix::price_matrix( $pmh, $ref, $decimalplaces, $form,
-                $myconfig );
 
             $ref->{sellprice} = $ref->{fxsellprice};
             $ref->{qty} *= -1;
@@ -1304,6 +1304,8 @@ sub retrieve_item {
     my $ptref;
 
     while ( $ref = $sth->fetchrow_hashref(NAME_lc) ) {
+        PriceMatrix::price_matrix( $pmh, $ref, '', $decimalplaces, $form,
+            $myconfig );
         $form->db_parse_numeric(sth=>$sth, hashref=>$ref);
 
         my ($dec) = ( $ref->{sellprice} =~ /\.(\d+)/ );
@@ -1321,8 +1323,6 @@ sub retrieve_item {
         chop $ref->{taxaccounts};
 
         # get vendor price and partnumber
-        PriceMatrix::price_matrix( $pmh, $ref, $decimalplaces, $form,
-            $myconfig );
 
         $ref->{description} = $ref->{translation}
           if $ref->{translation};