Bugzilla – Attachment 30632 Details for
Bug 10076
Add Bcc syspref for claimacquisition and clamissues
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10076 - Fixed merge conflicts.
Bug-10076---Fixed-merge-conflicts.patch (text/plain), 1.92 KB, created by
Maxime Beaulieu
on 2014-08-08 15:23:37 UTC
(
hide
)
Description:
Bug 10076 - Fixed merge conflicts.
Filename:
MIME Type:
Creator:
Maxime Beaulieu
Created:
2014-08-08 15:23:37 UTC
Size:
1.92 KB
patch
obsolete
>From 81934443e2abc025da066a07a80fcbb4ea7d58ef Mon Sep 17 00:00:00 2001 >From: mbeaulieu <mbeaulieu@inlibro.com> >Date: Fri, 8 Aug 2014 11:19:01 -0400 >Subject: [PATCH] Bug 10076 - Fixed merge conflicts. > >Patch now applies properly > > modified: C4/Letters.pm > modified: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref >--- > C4/Letters.pm | 3 +++ > .../en/modules/admin/preferences/acquisitions.pref | 8 ++++++++ > 2 files changed, 11 insertions(+) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 1d916e0..6497cee 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -356,6 +356,9 @@ sub SendAlerts { > Message => Encode::encode( "utf8", "" . $letter->{content} ), > 'Content-Type' => 'text/plain; charset="utf8"', > ); >+ if (C4::Context->preference("ClaimsBccCopy")) { >+ $mail{'Bcc'} = $userenv->{emailaddress}; >+ } > sendmail(%mail) or carp $Mail::Sendmail::error; > > logaction( >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 ac57f95..c31ea12 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 >@@ -57,6 +57,14 @@ Acquisitions: > type: textarea > - "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2" > - "<br/>For example:<br/>price: 947$a|947$c<br/>quantity: 969$h<br/>budget_code: 922$a" >+ - >+ - Send a copy in bcc of the claimacquisition and claimissues letters to the active user >+ - pref: ClaimsBccCopy >+ default: no >+ choices: >+ yes: Send >+ no: Don't send >+ > Printing: > - > - Use the >-- >1.7.9.5
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 10076
:
17853
|
30632
|
31262
|
31397
|
40843
|
40844
|
40845
|
45181
|
45183
|
45264
|
45350
|
45361