X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FIS.pm;h=b47944bdcdda58ea9581a0228b14f4ed91ba9c43;hb=d8e671e98d27e9d819f853ae11b80d8e9165e925;hp=e78e3e134861d2ee59936e79d21448820fc41e44;hpb=5fdc44cb545488ac82b3dd851b40dfea4d35d779;p=kivitendo-erp.git diff --git a/SL/IS.pm b/SL/IS.pm index e78e3e134..b47944bdc 100644 --- a/SL/IS.pm +++ b/SL/IS.pm @@ -492,6 +492,8 @@ sub post_invoice { if (!$form->{employee_id}) { $form->get_employee($dbh); } + + $form->{defaultcurrency} = $form->get_default_currency($myconfig); ($null, $form->{department_id}) = split(/--/, $form->{department}); @@ -1099,9 +1101,6 @@ sub post_payment { # Delete all entries in acc_trans from prior payments. $self->_delete_payments($form, $dbh); - my @after_dp; - push @after_dp, selectall_hashref_query($form, $dbh, qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY oid|, $form->{id}); - # Save the new payments the user made before cleaning up $form. map { $payments{$_} = $form->{$_} } grep m/^datepaid_\d+$|^memo_\d+$|^source_\d+$|^exchangerate_\d+$|^paid_\d+$|^AR_paid_\d+$|^paidaccounts$/, keys %{ $form }; @@ -1112,7 +1111,7 @@ sub post_payment { # Retrieve the invoice from the database. $self->retrieve_invoice($myconfig, $form); - # Set up the content of $form in the way that IR::post_invoice() expects. + # Set up the content of $form in the way that IS::post_invoice() expects. $form->{exchangerate} = $form->format_amount($myconfig, $form->{exchangerate}); for $row (1 .. scalar @{ $form->{invoice_details} }) { @@ -1130,7 +1129,7 @@ sub post_payment { # Restore the payment options from the user input. map { $form->{$_} = $payments{$_} } keys %payments; - # Get the AP accno (which is normally done by Form::create_links()). + # Get the AR accno (which is normally done by Form::create_links()). $query = qq|SELECT c.accno FROM acc_trans at @@ -1795,7 +1794,7 @@ sub retrieve_item { my $query = qq|SELECT p.id, p.partnumber, p.description, p.sellprice, - p.listprice, p.inventory_accno_id, + p.listprice, p.inventory_accno_id, p.lastcost, c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart,