Lines 596-603
C4::Context->dbh->do("DELETE FROM accountlines");
Link Here
|
596 |
|
596 |
|
597 |
$dbh->rollback; |
597 |
$dbh->rollback; |
598 |
|
598 |
|
599 |
<<<<<<< HEAD |
|
|
600 |
======= |
601 |
{ |
599 |
{ |
602 |
# Don't allow renewing onsite checkout |
600 |
# Don't allow renewing onsite checkout |
603 |
my $barcode = 'R00000XXX'; |
601 |
my $barcode = 'R00000XXX'; |
Lines 635-639
$dbh->rollback;
Link Here
|
635 |
} |
633 |
} |
636 |
|
634 |
|
637 |
$schema->storage->txn_rollback(); |
635 |
$schema->storage->txn_rollback(); |
638 |
>>>>>>> ea92a92... Bug 14470: Do not allow renew for on-site checkouts |
|
|
639 |
1; |
636 |
1; |
640 |
- |
|
|