Attachment 37763 Details for Bug 13813 – Bug 13813 - Remove C4::Dates from C4/Barcodes/hbyymmincr.pm

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

Bug-13813---Remove-C4Dates-from-C4Barcodeshbyymmin.patch (text/plain), 3.09 KB, created by Marc Véron on 2015-04-13 15:42:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-04-13 15:42:24 UTC

Size: 3.09 KB

patch

obsolete

>From e7b61d91bd7e305a17c039f44735aaea579e9d23 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Fri, 13 Mar 2015 15:19:29 +0100
>Subject: [PATCH] Bug 13813 - Remove C4::Dates from C4/Barcodes/hbyymmincr.pm
>
>To test:
>Set syspref autoBarcode to <branchcode>yymm0001
>Edit items or add item, click in empty barcode field, verify that barcodes are filled in as appropriate.
>
>Amended following comment #58 /mv
>---
> C4/Barcodes/hbyymmincr.pm |   25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
>diff --git a/C4/Barcodes/hbyymmincr.pm b/C4/Barcodes/hbyymmincr.pm
>index 258a1a5..02ba7ae 100644
>--- a/C4/Barcodes/hbyymmincr.pm
>+++ b/C4/Barcodes/hbyymmincr.pm
>@@ -24,7 +24,6 @@ use Carp;
> 
> use C4::Context;
> use C4::Debug;
>-use C4::Dates;
> 
> use vars qw($VERSION @ISA);
> use vars qw($debug $cgi_debug);	# from C4::Debug, of course
>@@ -48,16 +47,16 @@ sub db_max {
> 	$debug and print STDERR "(hbyymmincr) db_max query: $query\n";
> 	my $sth = C4::Context->dbh->prepare($query);
> 	my ($iso);
>-	if (@_) {
>-		my $input = shift;
>-		$iso = C4::Dates->new($input,'iso')->output('iso'); # try to set the date w/ 2nd arg
>-		unless ($iso) {
>-			warn "Failed to create 'iso' Dates object with input '$input'.  Reverting to today's date.";
>-			$iso = C4::Dates->new->output('iso');	# failover back to today
>-		}
>-	} else {
>-		$iso = C4::Dates->new->output('iso');
>-	}
>+        if (@_) {
>+                my $input = shift;
>+                $iso = output_pref({ dt => dt_from_string( $input, 'iso' ), dateformat => 'iso', dateonly => 1 }); # try to set the date w/ 2nd arg
>+                unless ($iso) {
>+                        warn "Failed to create 'iso' Dates object with input '$input'.  Reverting to today's date.";
>+                        $iso = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });      # failover back to today
>+                }
>+        } else {
>+                $iso = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
>+        }
> 	my $year = substr($iso,2,2);    # i.e. "08" for 2008
> 	my $andtwo = $width+2;
> 	$sth->execute("^[a-zA-Z]{1,}" . $year . "[0-9]{$andtwo}");	# the extra two digits are the month.  we don't care what they are, just that they are there.
>@@ -74,7 +73,7 @@ sub db_max {
> sub initial {
> 	my $self = shift;
> 	# FIXME: populated branch?
>-	my $iso = C4::Dates->new->output('iso'); 	# like "2008-07-02"
>+	my $iso = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }); 	# like "2008-07-02"
> 	return $self->branch . substr($iso,2,2) . substr($iso,5,2) . sprintf('%' . "$width.$width" . 'd',1);
> }
> 
>@@ -104,7 +103,7 @@ sub process_head {	# (self,head,whole,specific)
> 	my ($self,$head,$whole,$specific) = @_;
> 	$specific and return $head;	# if this is built off an existing barcode, just return the head unchanged.
> 	$head =~ s/\d{4}$//;		# else strip the old yymm
>-	my $iso = C4::Dates->new->output('iso'); 	# like "2008-07-02"
>+	my $iso = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }); 	# like "2008-07-02"
> 	return $head . substr($iso,2,2) . substr($iso,5,2);
> }
> 
>-- 
>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