From 143cc6b31aad490f8d1be4ab855e7cbca384992d 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 Signed-off-by: Paola Rossi --- C4/Letters.pm | 2 ++ .../en/modules/admin/preferences/acquisitions.pref | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/C4/Letters.pm b/C4/Letters.pm index db9f987..180e9ef 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -535,6 +535,8 @@ sub SendAlerts { if C4::Context->preference('ReplytoDefault'); $mail{'Sender'} = C4::Context->preference('ReturnpathDefault') if C4::Context->preference('ReturnpathDefault'); + $mail{'Bcc'} = $userenv->{emailaddress} + if C4::Context->preference("ClaimsBccCopy"); unless ( sendmail(%mail) ) { carp $Mail::Sendmail::error; 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 b52b5a9..6246334 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 @@ -60,6 +60,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