View | Details | Raw Unified | Return to bug 40445
Collapse All | Expand All

(-)a/Koha/Cash/Register.pm (-1 / +16 lines)
Lines 126-131 sub outstanding_accountlines { Link Here
126
        $since->count
126
        $since->count
127
        ? { 'date' => { '>' => $since->get_column('timestamp')->as_query } }
127
        ? { 'date' => { '>' => $since->get_column('timestamp')->as_query } }
128
        : {};
128
        : {};
129
130
    # Exclude reconciliation accountlines from outstanding accountlines
131
    $local_conditions->{'-and'} = [
132
        {
133
            '-or' => [
134
                { 'credit_type_code' => { '!=' => 'CASHUP_SURPLUS' } },
135
                { 'credit_type_code' => undef }
136
            ]
137
        },
138
        {
139
            '-or' => [
140
                { 'debit_type_code' => { '!=' => 'CASHUP_DEFICIT' } },
141
                { 'debit_type_code' => undef }
142
            ]
143
        }
144
    ];
129
    my $merged_conditions =
145
    my $merged_conditions =
130
        $conditions
146
        $conditions
131
        ? { %{$conditions}, %{$local_conditions} }
147
        ? { %{$conditions}, %{$local_conditions} }
132
- 

Return to bug 40445