Bugzilla – Attachment 49042 Details for
Bug 7736
Edifact QUOTE and ORDER functionality
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7736 [QA Followup] - Fix spelling and pod errors
Bug-7736-QA-Followup---Fix-spelling-and-pod-errors.patch (text/plain), 7.37 KB, created by
Kyle M Hall (khall)
on 2016-03-11 15:50:35 UTC
(
hide
)
Description:
Bug 7736 [QA Followup] - Fix spelling and pod errors
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-03-11 15:50:35 UTC
Size:
7.37 KB
patch
obsolete
>From 88dc1a65a484dcf488d5d4429c48237fdc8f7dd3 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 11 Mar 2016 14:01:24 +0000 >Subject: [PATCH] Bug 7736 [QA Followup] - Fix spelling and pod errors > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > Koha/EDI.pm | 48 ++++++++++++++++++++++++------------------------ > Koha/Edifact/Line.pm | 4 ++-- > Koha/Edifact/Order.pm | 5 +++-- > 3 files changed, 29 insertions(+), 28 deletions(-) > >diff --git a/Koha/EDI.pm b/Koha/EDI.pm >index 2f4a0ca..26f05e1 100644 >--- a/Koha/EDI.pm >+++ b/Koha/EDI.pm >@@ -346,12 +346,12 @@ sub receipt_items { > } > push @{ $branch_map{$b} }, $item; > } >- my $gir_occurence = 0; >- while ( $gir_occurence < $quantity ) { >- my $branch = $inv_line->girfield( 'branch', $gir_occurence ); >+ my $gir_occurrence = 0; >+ while ( $gir_occurrence < $quantity ) { >+ my $branch = $inv_line->girfield( 'branch', $gir_occurrence ); > my $item = shift @{ $branch_map{$branch} }; > if ($item) { >- my $barcode = $inv_line->girfield( 'barcode', $gir_occurence ); >+ my $barcode = $inv_line->girfield( 'barcode', $gir_occurrence ); > if ( $barcode && !$item->barcode ) { > my $rs = $schema->resultset('Item')->search( > { >@@ -373,7 +373,7 @@ sub receipt_items { > else { > $logger->warn("Unmatched item at branch:$branch"); > } >- ++$gir_occurence; >+ ++$gir_occurrence; > } > return; > >@@ -657,20 +657,20 @@ sub quote_item { > } > > if ( $order_quantity == 1 && $item->quantity > 1 ) { >- my $occurence = 1; # occ zero already added >- while ( $occurence < $item->quantity ) { >+ my $occurrence = 1; # occ zero already added >+ while ( $occurrence < $item->quantity ) { > > # check budget code > $budget = _get_budget( $schema, >- $item->girfield( 'fund_allocation', $occurence ) ); >+ $item->girfield( 'fund_allocation', $occurrence ) ); > > if ( !$budget ) { > my $bad_budget = >- $item->girfield( 'fund_allocation', $occurence ); >+ $item->girfield( 'fund_allocation', $occurrence ); > carp 'Skipping line with no budget info'; > $logger->trace( > "girfield skipped for invalid budget:$bad_budget"); >- ++$occurence; ## lets look at the next one not this one again >+ ++$occurrence; ## lets look at the next one not this one again > next; > } > >@@ -703,16 +703,16 @@ sub quote_item { > } > my $new_item = { > itype => >- $item->girfield( 'stock_category', $occurence ), >+ $item->girfield( 'stock_category', $occurrence ), > location => >- $item->girfield( 'collection_code', $occurence ), >+ $item->girfield( 'collection_code', $occurrence ), > itemcallnumber => >- $item->girfield( 'shelfmark', $occurence ) >- || $item->girfield( 'classification', $occurence ) >+ $item->girfield( 'shelfmark', $occurrence ) >+ || $item->girfield( 'classification', $occurrence ) > || title_level_class($item), > holdingbranch => >- $item->girfield( 'branch', $occurence ), >- homebranch => $item->girfield( 'branch', $occurence ), >+ $item->girfield( 'branch', $occurrence ), >+ homebranch => $item->girfield( 'branch', $occurrence ), > }; > if ( $new_item->{itype} ) { > $item_hash->{itype} = $new_item->{itype}; >@@ -744,7 +744,7 @@ sub quote_item { > ); > } > >- ++$occurence; >+ ++$occurrence; > } > > # increment quantity in orderline for EXISTING budget in $budgets >@@ -772,16 +772,16 @@ sub quote_item { > price => $item->price, > replacementprice => $item->price, > itype => >- $item->girfield( 'stock_category', $occurence ), >+ $item->girfield( 'stock_category', $occurrence ), > location => >- $item->girfield( 'collection_code', $occurence ), >+ $item->girfield( 'collection_code', $occurrence ), > itemcallnumber => >- $item->girfield( 'shelfmark', $occurence ) >- || $item->girfield( 'classification', $occurence ) >+ $item->girfield( 'shelfmark', $occurrence ) >+ || $item->girfield( 'classification', $occurrence ) > || $item_hash->{itemcallnumber}, > holdingbranch => >- $item->girfield( 'branch', $occurence ), >- homebranch => $item->girfield( 'branch', $occurence ), >+ $item->girfield( 'branch', $occurrence ), >+ homebranch => $item->girfield( 'branch', $occurrence ), > }; > my $itemnumber; > ( undef, undef, $itemnumber ) = >@@ -795,7 +795,7 @@ sub quote_item { > ); > } > >- ++$occurence; >+ ++$occurrence; > } > } > } >diff --git a/Koha/Edifact/Line.pm b/Koha/Edifact/Line.pm >index ed59f50..7fdd305 100644 >--- a/Koha/Edifact/Line.pm >+++ b/Koha/Edifact/Line.pm >@@ -453,7 +453,7 @@ sub coded_substitute_text { > > # This will take a standard code as returned > # by (orderline|substitue)-free_text (FTX seg LIN) >-# and expand it useing EditEUR code list 8B >+# and expand it using EditEUR code list 8B > sub translate_8B { > my ($code) = @_; > >@@ -635,7 +635,7 @@ sub girfield { > my ( $self, $field, $occ ) = @_; > if ( $self->number_of_girs ) { > >- # defaults to occurence 0 returns undef if occ requested > occs >+ # defaults to occurrence 0 returns undef if occ requested > occs > if ( defined $occ && $occ >= @{ $self->{GIR} } ) { > return; > } >diff --git a/Koha/Edifact/Order.pm b/Koha/Edifact/Order.pm >index f1e5811..0381128 100644 >--- a/Koha/Edifact/Order.pm >+++ b/Koha/Edifact/Order.pm >@@ -127,7 +127,7 @@ sub interchange_header { > > # syntax identifier > my $hdr = >- 'UNB+UNOC:3'; # controling agency character set syntax version number >+ 'UNB+UNOC:3'; # controlling agency character set syntax version number > # Interchange Sender > $hdr .= _interchange_sr_identifier( $self->{sender}->ean, > $self->{sender}->id_code_qualifier ); # interchange sender >@@ -714,7 +714,8 @@ Make handling of GIR segments more customizable > > =head2 trailing_service_segments > >- Include the service segments occuring at the end of the message >+ Include the service segments occurring at the end of the message >+ > =head2 interchange_control_reference > > Returns the unique interchange control reference as a 14 digit number >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7736
:
8275
|
8276
|
8446
|
8635
|
10226
|
12398
|
12438
|
12467
|
13071
|
15304
|
15729
|
16538
|
16629
|
16649
|
16652
|
16667
|
16732
|
16761
|
16779
|
16792
|
16864
|
16865
|
16866
|
16867
|
16868
|
16869
|
16870
|
16871
|
16872
|
16873
|
16874
|
16882
|
16883
|
16884
|
16885
|
16886
|
17120
|
17121
|
20983
|
20984
|
21475
|
33953
|
33957
|
34332
|
34833
|
35030
|
35106
|
35716
|
35717
|
35718
|
36738
|
44079
|
44080
|
44081
|
44082
|
44083
|
44084
|
46996
|
47004
|
48623
|
48624
|
48625
|
48626
|
48971
|
48972
|
48973
|
48974
|
48975
|
48976
|
49037
|
49038
|
49039
|
49040
|
49041
| 49042 |
49307
|
49850
|
50002
|
50008