Bugzilla – Attachment 4817 Details for
Bug 4415
child record only using parent's info
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bug_4415: Copy parent contact details to child when adding Let child details be managed separately
bug4415-Copy-parent-contact-details-to-child-when-.patch (text/plain), 6.10 KB, created by
Chris Cormack
on 2011-08-03 10:20:42 UTC
(
hide
)
Description:
bug_4415: Copy parent contact details to child when adding Let child details be managed separately
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-08-03 10:20:42 UTC
Size:
6.10 KB
patch
obsolete
>From 33a9aec802f6833bc7d3b6eb1eeb8e6dce2742f8 Mon Sep 17 00:00:00 2001 >From: Srdjan Jankovic <srdjan@catalyst.net.nz> >Date: Wed, 3 Aug 2011 12:04:21 +0200 >Subject: [PATCH] bug_4415: Copy parent contact details to child when adding Let child details be managed separately > >Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> >Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >--- > .../prog/en/modules/members/moremember.tt | 11 +------- > members/memberentry.pl | 25 +++++++++---------- > members/moremember.pl | 6 ---- > 3 files changed, 14 insertions(+), 28 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 6287611..67286bf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -356,9 +356,9 @@ function validate1(date) { > </div> > <div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=3">Edit</a></div> > >+ [% UNLESS ( I ) %] > <div id="patron-alternate-address" style="padding-top: 1em;"> > <h3>Alternate Address</h3> >- [% UNLESS ( I ) %][% UNLESS ( C ) %] > <div class="rows"> <ol><li><span class="label">Address: </span>[% B_address %]</li> > <li><span class="label">Address 2: </span>[% B_address2 %]</li> > <li><span class="label">City: </span>[% B_city %]</li> >@@ -367,16 +367,9 @@ function validate1(date) { > <li><span class="label">Country: </span>[% B_country %]</li> > [% IF ( B_phone ) %]<li><span class="label">Phone: </span>[% B_phone %]</li>[% END %] > [% IF ( B_email ) %]<li><span class="label">Email: </span>[% B_email %]</li>[% END %]</ol></div> >- [% END %][% END %] >- [% IF ( C ) %] >- <div class="rows"> <ol><li><span class="label">Surname: </span>[% contactname %]</li> >- <li><span class="label">First name: </span>[% contactfirstname %]</li> >- <li><span class="label">Phone: </span>[% phone %]</li> >- <li><span class="label">Email: </span>[% email %]</li> >- <li><span class="label">Relationship: </span>[% relationship %]</li></ol></div> >- [% END %] > </div> > <div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=6">Edit</a></div> >+ [% END %] > > <div id="patron-alternative-contact" style="padding-top: 1em;"> > <h3>Alternative Contact</h3> >diff --git a/members/memberentry.pl b/members/memberentry.pl >index f6ca2c1..63ee154 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -211,13 +211,14 @@ if ( ( $op eq 'insert' ) and !$nodouble ) { > if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P' )) { > if (my $guarantordata=GetMember(borrowernumber => $guarantorid)) { > $guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'}; >- if ( !defined($data{'contactname'}) or $data{'contactname'} eq '' or >- $data{'contactname'} ne $guarantordata->{'surname'} ) { >- $newdata{'contactfirstname'}= $guarantordata->{'firstname'}; >- $newdata{'contactname'} = $guarantordata->{'surname'}; >- $newdata{'contacttitle'} = $guarantordata->{'title'}; >+ $newdata{'contactfirstname'}= $guarantordata->{'firstname'}; >+ $newdata{'contactname'} = $guarantordata->{'surname'}; >+ $newdata{'contacttitle'} = $guarantordata->{'title'}; >+ if ( $op eq 'add' ) { > foreach (qw(streetnumber address streettype address2 >- zipcode country city phone phonepro mobile fax email emailpro branchcode)) { >+ zipcode country city state phone phonepro mobile fax email emailpro branchcode >+ B_streetnumber B_streettype B_address B_address2 >+ B_city B_state B_zipcode B_country B_email B_phone)) { > $newdata{$_} = $guarantordata->{$_}; > } > } >@@ -225,12 +226,10 @@ if ( $guarantorid and ( $category_type eq 'C' || $category_type eq 'P' )) { > } > > ###############test to take the right zipcode, country and city name ############## >-if (!defined($guarantorid) or $guarantorid eq '' or $guarantorid eq '0') { >- # set only if parameter was passed from the form >- $newdata{'city'} = $input->param('city') if defined($input->param('city')); >- $newdata{'zipcode'} = $input->param('zipcode') if defined($input->param('zipcode')); >- $newdata{'country'} = $input->param('country') if defined($input->param('country')); >-} >+# set only if parameter was passed from the form >+$newdata{'city'} = $input->param('city') if defined($input->param('city')); >+$newdata{'zipcode'} = $input->param('zipcode') if defined($input->param('zipcode')); >+$newdata{'country'} = $input->param('country') if defined($input->param('country')); > > #builds default userid > if ( (defined $newdata{'userid'}) && ($newdata{'userid'} eq '')){ >@@ -677,7 +676,7 @@ $template->param(CGIbranch=>$CGIbranch) if ($CGIbranch); > $template->param( > nodouble => $nodouble, > borrowernumber => $borrowernumber, #register number >- guarantorid => (($borrower_data->{'guarantorid'})) ? $borrower_data->{'guarantorid'} : $guarantorid, >+ guarantorid => ($borrower_data->{'guarantorid'} || $guarantorid), > ethcatpopup => $ethcatpopup, > relshiploop => \@relshipdata, > city_loop => $city_arrayref, >diff --git a/members/moremember.pl b/members/moremember.pl >index b766f2f..9292fd0 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -157,12 +157,6 @@ $data->{ "sex_".$data->{'sex'}."_p" } = 1; > > my $catcode; > if ( $category_type eq 'C') { >- if ($data->{guarantorid} ) { >- my $data2 = GetMember( 'borrowernumber' => $data->{'guarantorid'} ); >- foreach (qw(address address2 city state B_address B_address2 B_city B_state phone mobile zipcode B_zipcode country B_country)) { >- $data->{$_} = $data2->{$_}; >- } >- } > my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); > my $cnt = scalar(@$catcodes); > >-- >1.7.4.1
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 4415
:
2560
|
2561
|
2562
|
4672
|
4704
|
4721
|
4722
|
4750
|
4816
| 4817