-- Merge issues:   --
---------------------
git pull
git bz apply [9016 10832 10833 10845 11208]
So far so good!

So then we get the merge error :(
http://pastebin.com/PrxXt4t4

Merging ok! Maybe someone with TalkingTechItiva in use might be better suited to sign this task off.

Can we get a sign off on this please?

Problems to test: Bug 9016 gives merge errors, 
also on updatedatbase.pl (this patch),
don't we need
if ( CheckVersion($DBversion) ) {
instead of
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
?

(In reply to Bernardo Gonzalez Kriegel from comment #6)
Bug 9016 rebased against master.
This patch applies cleanly on top of bug 9016 and bug 10845.

I'm seeing this code in the Itiva cronjob:

        my $letter = C4::Letters::GetPreparedLetter(
            module      => $module,
            letter_code => $code,
            tables      => {
                borrowers   => $issues->{'borrowernumber'},
                biblio      => $issues->{'biblionumber'},
                biblioitems => $issues->{'biblionumber'},
                message_transport_type => 'phone',
            },
            message_transport_type => 'phone',
        );

The duplicated mtt seems odd to me. Is that correct?

(In reply to M. de Rooy from comment #9)
> The duplicated mtt seems odd to me. Is that correct?

No, it seems that the one introduced by bug 10845 is wrong. I will provide follow-ups.

Please add the bug number too in the print message of updatedatabase

Patch rebased on top of bug 9016 and bug 10845.

Created attachment 27876 [details] [review]
Bug 11867: MTT: Manage *_PHONE notices

The *_PHONE notices (HOLD_PHONE, PREDUE_PHONE and OVERDUE_PHONE) should
be "merged" into the main code (i.e. HOLD, PREDUE and OVERDUE).

Test plan:
1/ Make sure you have HOLD_PHONE, PREDUE_PHONE and OVERDUE_PHONE notices
2/ Execute the update DB entry
3/ Verify the 3 notices have been merged into "phone" template of the
HOLD, PREDUE and OVERDUE notices
4/ Verify there is no regression in the Talking Tech feature (how?)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No koha-qa errors

Verified that notices are merged
TalkingTech_itiva_outbound.pl runs without problem... but can't produce
any output, may be not correctly configured (my setup), no warnings
nor log messages

Last patch adds the bug number in the updatedb entry.

The sql construct
name=(SELECT name FROM ( SELECT name FROM letter  WHERE code= ... LIMIT 1) AS t)
does probably not win beauty prices :)

You could try something with joining letter in the update statement. But on the other hand why would you? You do not need to change the name for the Phone notices. That name should be fine. Note that the SELECT .. LIMIT 1 will not always provide the best choice; you are not even sure which one he picks.

Is it an idea to remove name from the UPDATE?

Created attachment 27920 [details] [review]
Bug 11867: Change the sql query in order to win beauty prices

(In reply to M. de Rooy from comment #17)
> The sql construct
> name=(SELECT name FROM ( SELECT name FROM letter  WHERE code= ... LIMIT 1)
> AS t)
> does probably not win beauty prices :)

Erk

> Is it an idea to remove name from the UPDATE?

The name should be the same for all letters with the same code.

I will also be including this in part of the overall MTT push to master.

Pushed to master.  Thanks, Jonathan!