From e8f9647be5b277a7351e551c313bed34a0b5767b Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Tue, 28 May 2013 23:03:59 -0400 Subject: [PATCH] Bug 10366: Alert librarian if an invoice number is duplicated Some vendors ship materials from the same invoice in multiple packages. In those cases, it would be good to notify the librarian when they enter a duplicate invoice number, so that they can continue receiving on the previously-created invoice, rather than creating an invoice with a duplicate number. To test: 1) Apply patch and run database update. 2) Make sure that you have created at least one invoice on acqui/parcels.pl and take note of the invoice number. 3) Try to create an invoice with the same invoice number. 4) Note that without changing your configuration this works exactly the same as before. 5) Turn on the AcqWarnOnDuplicateInvoice system preference. 6) Try to create a new invoice with the same number as the one you noted earlier. 7) Make sure you get a warning about a duplicate invoice. 8) Choose to receive on the existing invoice. 9) Confirm that you are receiving on said existing invoice. 10) Start the receiving process over, and this time choose "Create new invoice anyway." 11) Confirm that you are now receiving on a new invoice. --- acqui/parcels.pl | 30 ++++++++++++++----- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 13 ++++++++ .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 31 +++++++++++++++++++- .../en/modules/admin/preferences/acquisitions.pref | 6 ++++ 5 files changed, 73 insertions(+), 8 deletions(-) diff --git a/acqui/parcels.pl b/acqui/parcels.pl index 405ff64..7d4cc00 100755 --- a/acqui/parcels.pl +++ b/acqui/parcels.pl @@ -98,14 +98,30 @@ our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( } ); +my $invoicenumber = $input->param('invoice'); +my $shipmentdate = $input->param('shipmentdate'); +my $shipmentcost = $input->param('shipmentcost'); +my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid'); +if($shipmentdate) { + $shipmentdate = C4::Dates->new($shipmentdate)->output('iso'); +} + if($op and $op eq 'new') { - my $invoicenumber = $input->param('invoice'); - my $shipmentdate = $input->param('shipmentdate'); - my $shipmentcost = $input->param('shipmentcost'); - my $shipmentcost_budgetid = $input->param('shipmentcost_budgetid'); - if($shipmentdate) { - $shipmentdate = C4::Dates->new($shipmentdate)->output('iso'); + my @invoices = GetInvoices( + supplierid => $booksellerid, + invoicenumber => $invoicenumber, + ); + if ($#invoices > 0 && C4::Context->preference('AcqWarnOnDuplicateInvoice')) { + $template->{'VARS'}->{'duplicate_invoices'} = \@invoices; + $template->{'VARS'}->{'invoicenumber'} = $invoicenumber; + $template->{'VARS'}->{'shipmentdate'} = $shipmentdate; + $template->{'VARS'}->{'shipmentcost'} = $shipmentcost; + $template->{'VARS'}->{'shipmentcost_budgetid'} = $shipmentcost_budgetid; + } else { + $op = 'confirm'; } +} +if ($op and $op eq 'confirm') { my $invoiceid = AddInvoice( invoicenumber => $invoicenumber, booksellerid => $booksellerid, @@ -114,7 +130,7 @@ if($op and $op eq 'new') { shipmentcost_budgetid => $shipmentcost_budgetid, ); if(defined $invoiceid) { - # Successful 'Add' +# Successful 'Add' print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid"); exit 0; } else { diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 31485bc..6c5f073 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -427,3 +427,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('UseCourseReserves', '0', 'Enable the course reserves feature.', NULL, 'YesNo'); INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacShowHoldNotes',0,'Show hold notes on OPAC','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo'); +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AcqWarnOnDuplicateInvoice','0','Warn librarians when they try to create a duplicate invoice', '', 'YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f3a90d8..dee9963 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6984,6 +6984,19 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ( } +$DBversion = "3.13.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do( + q{ +INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AcqWarnOnDuplicateInvoice','0','Warn librarians when they try to create a duplicate invoice', '', 'YesNo'); +} + ); + print +"Upgrade to $DBversion done (Bug 10366 - Add system preference to enabling warning librarian when invoice is duplicated)\n"; + SetVersion($DBversion); +} + + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 39c53e2..209117c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -1,3 +1,4 @@ +[% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Receive shipment from vendor [% name %] @@ -38,6 +39,34 @@ [% END %]

Receive shipment from vendor [% name %]

+ [% IF duplicate_invoices %] +
+

This invoice number has already been used. Would you like to receive on an existing invoice?

+ + + + [% FOREACH invoice IN duplicate_invoices %] + + + + + + [% END %] + +
Invoice no.Shipment date
[% invoice.invoicenumber %][% invoice.shipmentdate | $KohaDates %]Receive
+
+ + + + + + + +
+
+ [% END %] + + [% IF ( count ) %]

[% count %] shipments

@@ -107,7 +136,7 @@
[% END %] - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index 1ec49ff..cb5a4c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -35,6 +35,12 @@ Acquisitions: - Default tax rates are - pref: gist - (enter in numeric form, 0.12 for 12%. First is the default. If you want more than 1 value, please separate with |) + - + - pref: AcqWarnOnDuplicateInvoice + choices: + yes: Warn + no: "Do not warn" + - when the librarian tries to create an invoice with a duplicate number. Printing: - -- 1.7.9.5