Attachment 37736 Details for Bug 13813 – Bug 13813 - Remove C4::Dates from C4/Acquisition.pm

[patch] Bug 13813 - Remove C4::Dates from C4/Acquisition.pm

Bug-13813---Remove-C4Dates-from-C4Acquisitionpm.patch (text/plain), 1.99 KB, created by Marc Véron on 2015-04-13 12:55:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-04-13 12:55:13 UTC

Size: 1.99 KB

patch

obsolete

>From 2d14fcb89db51b5f125e3000f9253eeed43dfd2a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Thu, 12 Mar 2015 14:37:28 +0100
>Subject: [PATCH] Bug 13813 - Remove C4::Dates from C4/Acquisition.pm
>
>This patch removes depraceted C4::Dates from C4/Acquisition.pm
>
>To test:
>Apply patch
>Go to Home > Acquisitions
>Verify that receiving orders works as before (Receiving orders only affected by this patch)
>
>Amended because of mistake (otputpref should be dateformat), see comment #57/ MV
>Amended because of "use Koha::DateUtils;" instead of original, See comment #59 /MV
>---
> C4/Acquisition.pm |    7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 0bb34c6..c840403 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -22,14 +22,13 @@ use Modern::Perl;
> use Carp;
> use C4::Context;
> use C4::Debug;
>-use C4::Dates qw(format_date format_date_in_iso);
> use MARC::Record;
> use C4::Suggestions;
> use C4::Biblio;
> use C4::Contract;
> use C4::Debug;
> use C4::Templates qw(gettemplate);
>-use Koha::DateUtils qw( dt_from_string output_pref );
>+use Koha::DateUtils;
> use Koha::Acquisition::Order;
> use Koha::Acquisition::Bookseller;
> use Koha::Number::Price;
>@@ -1400,7 +1399,7 @@ sub ModReceiveOrder {
>     my $order_vendornote = $params->{order_vendornote};
> 
>     my $dbh = C4::Context->dbh;
>-    $datereceived = C4::Dates->output('iso') unless $datereceived;
>+    $datereceived = output_pref({ dt=>DateTime->now(), dateonly=>1, dateformat=>'iso' }) unless $datereceived;
>     my $suggestionid = GetSuggestionFromBiblionumber( $biblionumber );
>     if ($suggestionid) {
>         ModSuggestion( {suggestionid=>$suggestionid,
>@@ -2726,7 +2725,7 @@ sub CloseInvoice {
> 
> Reopen an invoice
> 
>-Equivalent to ModInvoice(invoiceid => $invoiceid, closedate => C4::Dates->new()->output('iso'))
>+Equivalent to ModInvoice(invoiceid => $invoiceid, closedate => output_pref({ dt=>DateTime->now(), dateonly=>1, otputpref=>'iso' }))
> 
> =cut
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 13813: 36827 | 36828 | 36829 | 36830 | 36831 | 36832 | 36835 | 36836 | 36839 | 36845 | 36850 | 36851 | 36855 | 36857 | 36858 | 36859 | 36862 | 36863 | 36864 | 36865 | 36870 | 36871 | 36872 | 36878 | 36879 | 36880 | 36881 | 36882 | 36883 | 36884 | 36885 | 36886 | 36887 | 36888 | 36889 | 36890 | 36892 | 36893 | 36894 | 36895 | 36896 | 36897 | 36898 | 36899 | 36900 | 36901 | 36902 | 37227 | 37730 | 37731 | 37732 | 37736 | 37737 | 37746 | 37748 | 37749 | 37753 | 37754 | 37757 | 37762 | 37763 | 37764 | 37765 | 37766 | 37767 | 37768 | 37770 | 37810 | 37828 | 37835 | 37839 | 37840 | 37841 | 37842 | 37843 | 37853 | 37854 | 37855 | 37856 | 37857 | 37858 | 37859 | 37860 | 37861 | 37862 | 37863 | 37864 | 37865 | 37866 | 37867 | 37868 | 37869 | 37870 | 37871 | 37872 | 37873 | 37874 | 37875 | 37876 | 37877 | 37878 | 37879 | 37880 | 37881 | 37882 | 37883 | 37884 | 37885 | 37886 | 37887 | 37888 | 37889 | 37890 | 37891 | 39666 | 40894 | 42052 | 42175 | 42274 | 42286 | 42292 | 42293 | 42294