gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22435: (follow-up) Update POS for reduced offset types 

This patch updates the Koha::Charges::Sales class to use the 'CREATE'
and 'APPLY' offset types.

Test plan
1/ Run t/db_dependent/Koha/Charges/Sales.t

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Martin Renvoize 2021-06-21 15:43:04 +01:00 committed by Jonathan Druart
parent 2ec46485b3
commit 37c795d589
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Koha/Charges/Sales.pm
View File

@ -196,7 +196,7 @@ sub purchase {
my $schema = Koha::Database->new->schema;
my $dt = dt_from_string();
my $total_owed = 0;
my $credit;
my $payment;
$schema->txn_do(
sub {
@ -213,7 +213,7 @@ sub purchase {
{
amount => $amount,
debit_type_code => $item->{code},
amountoutstanding => 0,
amountoutstanding => $amount,
note => $item->{quantity},
manager_id => $self->{staff_id},
interface => 'intranet',
@ -227,19 +227,19 @@ sub purchase {
my $account_offset = Koha::Account::Offset->new(
{
debit_id => $debit->id,
type => 'Purchase',
type => 'CREATE',
amount => $amount
}
)->store();
}
# Add accountline for payment
$credit = Koha::Account::Line->new(
$payment = Koha::Account::Line->new(
{
amount => 0 - $total_owed,
credit_type_code => 'PURCHASE',
payment_type => $self->{payment_type},
amountoutstanding => 0,
amountoutstanding => 0 - $total_owed,
manager_id => $self->{staff_id},
interface => 'intranet',
branchcode => $self->{cash_register}->branch,
@ -250,29 +250,21 @@ sub purchase {
)->store();
# Record the account offset
my $credit_offset = Koha::Account::Offset->new(
my $payment_offset = Koha::Account::Offset->new(
{
credit_id => $credit->id,
type => 'Purchase',
amount => $credit->amount
credit_id => $payment->id,
type => 'CREATE',
amount => $payment->amount
}
)->store();
# Link payment to debits
for my $debit ( @{$debits} ) {
Koha::Account::Offset->new(
{
credit_id => $credit->accountlines_id,
debit_id => $debit->id,
amount => $debit->amount * -1,
type => 'Payment',
}
)->store();
}
# Link payment to charges
$payment->apply( { debits => $debits } );
$payment->discard_changes;
}
);
return $credit;
return $payment;
}
=head1 AUTHOR

4
t/db_dependent/Koha/Charges/Sales.t
View File

@ -236,8 +236,8 @@ subtest 'purchase tests' => sub {
is(ref($credit), 'Koha::Account::Line', "Koha::Account::Line returned");
ok($credit->is_credit, "return is a credit for payment");
is($credit->credit_type_code, 'PURCHASE', "credit_type_code set correctly to 'PURCHASE' for payment");
is($credit->amount, -5.00, "amount is calculated correctly for payment");
is($credit->amountoutstanding, 0.00, "amountoutstanding is set to zero for payment");
is($credit->amount * 1, -5, "amount is calculated correctly for payment");
is($credit->amountoutstanding * 1, 0, "amountoutstanding is set to zero for payment");
is($credit->manager_id, $staff->borrowernumber, "manager_id set correctionly for payment");
is($credit->register_id, $cash_register->id, "register_id set correctly for payment");
is($credit->payment_type, 'CASH', "payment_type set correctly for payment");