From 81934443e2abc025da066a07a80fcbb4ea7d58ef Mon Sep 17 00:00:00 2001 From: mbeaulieu 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" - "
For example:
price: 947$a|947$c
quantity: 969$h
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