Skip to content

Commit

Permalink
Revert "Simplify 'payment__reverse()' now that we have all payments i…
Browse files Browse the repository at this point in the history 
…n 'payments'"
  • Loading branch information
HuntorJohny committed Jan 21, 2020
1 parent 64b7efb commit 8b1a1c7
Show file tree
Hide file tree
Showing 7 changed files with 146 additions and 98 deletions.
10 changes: 9 additions & 1 deletion lib/LedgerSMB/Report/Invoices/Payments.pm
View file
Expand Up @@ -122,7 +122,15 @@ sub columns {
{col_id => 'select',
name => $self->Text('Selected'),
type => 'checkbox'},
{col_id => 'payment_id',
{col_id => 'credit_id',
type => 'hidden', },
{col_id => 'entity_class',
type => 'hidden', },
{col_id => 'voucher_id',
type => 'hidden', },
{col_id => 'source',
type => 'hidden', },
{col_id => 'date_paid',
type => 'hidden', },
{col_id => 'date_paid',
type => 'text',
Expand Down
17 changes: 13 additions & 4 deletions lib/LedgerSMB/Scripts/payment.pm
View file
Expand Up @@ -348,10 +348,19 @@ sub reverse_payments {
if ($request->{"select_$count"}) {

my $data = {
dbh => $request->{dbh},
batch_id => $request->{batch_id},
payment_id => $request->{"payment_id_$count"},
payment_date => $date_reversed,
dbh => $request->{dbh},
date_reversed => $date_reversed,
batch_id => $request->{batch_id},
cash_accno => $request->{cash_accno},
currency => $request->{currency},
exchangerate => $request->{exchangerate},
source => $request->{"source_$count"},
credit_id => $request->{"credit_id_$count"},
account_class => $request->{"entity_class_$count"},
voucher_id => $request->{"voucher_id_$count"},
date_paid => LedgerSMB::PGDate->from_input(
$request->{"date_paid_$count"}
),
};

my $payment = LedgerSMB::DBObject::Payment->new({base => $data});
Expand Down
11 changes: 9 additions & 2 deletions old/lib/LedgerSMB/DBObject/Payment.pm
View file
Expand Up @@ -55,6 +55,11 @@ calculation.

sub __validate__ {
my ($self) = shift @_;
# If the account class is not set, we don't know if it is a payment or a
# receipt. --CT
if (!$self->{account_class}) {
$self->error("account_class must be set")
};
# We should try to re-engineer this so that we don't have to include SQL in
# this file. --CT
return ($self->{current_date})
Expand Down Expand Up @@ -265,8 +270,10 @@ sub get_all_accounts {
=item $payment->reverse()
This function reverses a payment identified by C<payment_id> (passed upon
object instantiation).
This function reverses a payment. A payment is defined as one source
($payment->{source}) to one cash account ($payment->{cash_accno}) to one date
($payment->{date_paid}) to one vendor/customer ($payment->{credit_id},
$payment->{account_class}). This reverses the entries with that source.
=back
Expand Down
13 changes: 0 additions & 13 deletions sql/changes/1.8/payments-reversing.sql
View file

This file was deleted.

1 change: 0 additions & 1 deletion sql/changes/LOADORDER
View file
Expand Up @@ -122,4 +122,3 @@ mc/delete-migration-validation-data.sql
1.8/rm-templates-menus.sql
1.8/add-system-files-menu.sql
1.8/initialize-payments-from-vouchers.sql
1.8/payments-reversing.sql
186 changes: 112 additions & 74 deletions sql/modules/Payment.sql
View file
Expand Up @@ -1139,8 +1139,7 @@ CREATE TYPE payment_record AS (
batch_control text,
batch_description text,
voucher_id int,
date_paid date,
reversed_by int
date_paid date
);

DROP FUNCTION IF EXISTS payment__search(text, date, date, int, text, int, char(3));
Expand All @@ -1157,8 +1156,7 @@ $$
compound_array(array[array[act.id::text, act.accno,
act.description]]),
a.source, b.control_code, b.description,
v.id, p.payment_date,
(select r.id from payment r where r.reversing = p.id)
v.id, p.payment_date
from payment p
join payment_links l on p.id = l.payment_id
join entity_credit_account c on p.entity_credit_id = c.id
Expand Down Expand Up @@ -1209,86 +1207,126 @@ DROP FUNCTION IF EXISTS payment__reverse
in_date_reversed date, in_account_class int, in_batch_id int,
in_voucher_id int, in_exchangerate numeric, in_currency char(3));

DROP FUNCTION IF EXISTS payment__reverse
CREATE OR REPLACE FUNCTION payment__reverse
(in_source text, in_date_paid date, in_credit_id int, in_cash_accno text,
in_date_reversed date, in_account_class int, in_batch_id int,
in_voucher_id int);


CREATE OR REPLACE FUNCTION payment__reverse
(in_payment_id int, in_payment_date date, in_approved boolean,
in_batch_id int)
in_voucher_id int)
RETURNS INT
AS $$
DECLARE
t_payment_id int;
pay_row record;
t_voucher_id int;
t_voucher_inserted bool;

t_fxgain_id int;
t_fxloss_id int;
BEGIN
-- check against being an overpayment??
INSERT INTO payment (reference, gl_id, payment_class,
payment_date, closed, entity_credit_id,
employee_id, currency, reversing, notes)
SELECT reference, gl_id, payment_class,
in_payment_date, closed, entity_credit_id,
person__get_my_id(), currency, in_payment_id,
'This payment reverses ' || in_payment_id
FROM payment
WHERE id = in_payment_id
RETURNING id INTO t_payment_id;

-- Using a CTE because we can use the returned result to fill
-- the payment_links table without further temporary tables
WITH new_entries AS (
INSERT INTO acc_trans (trans_id, chart_id, transdate, source,
cleared, memo, invoice_id, approved,
cleared_on, reconciled_on, voucher_id,
amount_bc, amount_tc, curr)
SELECT trans_id, chart_id, in_payment_date, source,
false, memo, null, coalesce(in_approved, true),
null, null, null,
-1 * amount_bc, -1 * amount_tc, curr
FROM acc_trans a
WHERE exists (select 1 from payment_links pl
where pl.payment_id = in_payment_id
and a.entry_id = pl.entry_id)
RETURNING entry_id
)
INSERT INTO payment_links (payment_id, entry_id)
SELECT t_payment_id, entry_id
FROM new_entries;

IF in_batch_id IS NOT NULL THEN
--TODO: without vouchers, we could simply directly insert into
-- the batch when generating the acc_trans lines...
INSERT INTO voucher (trans_id, batch_id, batch_class)
select trans_id, in_batch_id,
(select case when payment_class = 1 then 4
else 7 end
from payment c where c.id = t_payment_id)
from acc_trans a join payment_links pl on a.entry_id = pl.entry_id
where pl.payment_id = t_payment_id
group by trans_id;

UPDATE acc_trans a
SET voucher_id =
(select id from voucher
where a.trans_id = voucher.trans_id
and voucher.batch_id = in_batch_id)
WHERE exists (select 1 from payment_links pl
where pl.entry_id = a.entry_id
and pl.payment_id = t_payment_id);
END IF;

RETURN t_payment_id;
select value::int INTO t_fxgain_id FROM setting_get('fxgain_accno_id');
select value::int INTO t_fxloss_id FROM setting_get('fxloss_accno_id');

IF in_batch_id IS NOT NULL THEN
t_voucher_id := nextval('voucher_id_seq');
t_voucher_inserted := FALSE;
END IF;
FOR pay_row IN
SELECT a.*,
(select distinct chart_id
from acc_trans ac
join account at on ac.chart_id = at.id
join account_link al on at.id = al.account_id
where ((al.description = 'AP'
and in_account_class = 1)
or (al.description = 'AR'
and in_account_class = 2))
and ac.trans_id = a.trans_id)
as ar_ap_account_id,
arap.curr, arap.orig_amount_tc, orig_amount_bc
FROM acc_trans a
JOIN (select id, curr, amount_tc as orig_amount_tc,
amount_bc as orig_amount_bc, entity_credit_account
FROM ar
WHERE in_account_class = 2
UNION
select id, curr, amount_tc as orig_amount_tc,
amount_bc as orig_amount_bc, entity_credit_account
FROM ap
WHERE in_account_class = 1
) arap ON (a.trans_id = arap.id)
JOIN entity_credit_account c
ON (arap.entity_credit_account = c.id)
JOIN account ch ON (a.chart_id = ch.id)
WHERE coalesce(a.source, '') = coalesce(in_source, '')
AND a.transdate = in_date_paid
AND in_credit_id = arap.entity_credit_account
AND in_cash_accno = ch.accno
and in_voucher_id IS NOT DISTINCT FROM voucher_id
LOOP
IF in_batch_id IS NOT NULL
AND t_voucher_inserted IS NOT TRUE
THEN
INSERT INTO voucher
(id, trans_id, batch_id, batch_class)
VALUES
(t_voucher_id, pay_row.trans_id, in_batch_id,
CASE WHEN in_account_class = 1 THEN 4
WHEN in_account_class = 2 THEN 7
END);

t_voucher_inserted := TRUE;
END IF;

INSERT INTO acc_trans
(trans_id, chart_id, amount_bc, curr, amount_tc,
transdate, source, memo, approved, voucher_id)
VALUES
(pay_row.trans_id, pay_row.chart_id,
-1 * pay_row.amount_bc,
pay_row.curr,
-1 * pay_row.amount_tc,
in_date_reversed,
in_source, 'Reversing ' || COALESCE(in_source, ''),
case when in_batch_id is not null then false
else true end, t_voucher_id),
(pay_row.trans_id, pay_row.ar_ap_account_id,
pay_row.amount_bc,
pay_row.curr,
pay_row.amount_tc,
in_date_reversed,
in_source, 'Reversing ' || COALESCE(in_source, ''),
case when in_batch_id is not null then false
else true end, t_voucher_id);

IF ABS((pay_row.amount_bc / pay_row.orig_amount_bc
* pay_row.orig_amount_tc) - pay_row.amount_tc)
> 0.005 THEN
INSERT INTO acc_trans (trans_id, chart_id, amount,
transdate, source, memo, approved,
voucher_id)
VALUES
(pay_row.trans_id,
case when (pay_row.amount_bc / pay_row.orig_amount_bc
* pay_row.orig_amount_tc)
> pay_row.amount_tc
THEN t_fxloss_id ELSE t_fxgain_id END,
(pay_row.amount_bc / pay_row.orig_amount_bc
* pay_row.orig_amount_tc) - pay_row.amount_tc,
in_date_reversed, in_source,
'Reversing ' || COALESCE(in_source, ''),
case when in_batch_id is not null then false
else true end, t_voucher_id);
END IF;

END LOOP;
RETURN 1;
END;
$$ LANGUAGE PLPGSQL;

COMMENT ON FUNCTION payment__reverse
(in_payment_id int, in_payment_date date, in_approved boolean,
in_batch_id int) IS $$
Reverses the payment identified by `in_payment_id`, adding the resulting
transactions into `in_batch_id` if that''s not null.

Returns the `id` of the reversal payment generated.
(in_source text, in_date_paid date, in_credit_id int, in_cash_accno text,
in_date_reversed date, in_account_class int, in_batch_id int,
in_voucher_id int) IS $$
Reverses a payment. All fields are mandatory except batch_id and voucher_id
because they determine the identity of the payment to be reversed.
$$;


Expand Down
6 changes: 3 additions & 3 deletions xt/42-payment.pg
View file
Expand Up @@ -40,7 +40,7 @@ BEGIN;
SELECT has_function('payment_get_vc_info',ARRAY['integer','integer']);
SELECT has_function('payment__overpayments_list',ARRAY['date','date','text','text','text']);
SELECT has_function('payment_post',ARRAY['date','integer','integer','character','numeric','text','text','integer[]','numeric[]','text[]','text[]','integer[]','numeric[]','integer[]','text[]','text[]','integer[]','integer[]','boolean']);
SELECT has_function('payment__reverse',ARRAY['integer','date','boolean','integer']);
SELECT has_function('payment__reverse',ARRAY['text','date','integer','text','date','integer','integer','integer']);
SELECT has_function('payment__search',ARRAY['text','date','date','integer','text','integer','character','text']);
SELECT has_function('payments_get_open_currencies',ARRAY['integer']);
SELECT has_function('payment_type__get_label',ARRAY['integer']);
Expand Down Expand Up @@ -265,8 +265,8 @@ BEGIN;
'After payment, the invoice is paid');
DEALLOCATE test;

SELECT payment__reverse(currval('payment_id_seq')::int, now()::date,
null::boolean, null::int);
SELECT payment__reverse('pmt-rev-src1', now()::date, -101, '00003',
now()::date, 1, null, null);

PREPARE test AS
SELECT amount::int, due::int
Expand Down

0 comments on commit 8b1a1c7

Please sign in to comment.