[koha-commits] main Koha release repository branch master updated. v3.14.00-921-gb91efb3

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  b91efb3b6668bdb50ea475571eae7858aa2b1f52 (commit)
       via  12470247b7fe2c06d66ba40b59df5e329b761b41 (commit)
       via  fda9976cda1669eb12feaeee9e900c5eb962e9ea (commit)
      from  54a62cddb323aea1fd05c3de8b5579bed07d106f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b91efb3b6668bdb50ea475571eae7858aa2b1f52
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Apr 28 15:37:43 2014 +0000

    Bug 12111: (follow-up) ensure that vendor note is not editable during order receiving
    
    This patch removes the ability of finishreceive.pl to change the vendor
    note of an order.  It also uses a normal span rather than a disabled
    textarea to display the vendor note on the receiving page, to emphasize
    that it cannot be changed.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 12470247b7fe2c06d66ba40b59df5e329b761b41
Author: Mathieu Saby <mathsabypro at gmail.com>
Date:   Sat Apr 26 14:37:42 2014 +0200

    Bug 12111: (follow-up) fix breadcrumbs wording for vendor note
    
    As asked by QAer,
    this followup fixes wording in modordernotes.tt for vendor note
    (Change order vendor note vendor note => Change order vendor note)
    It also uses [%- and -%] to make code more readable
    
    Test plan :
    try to edit a vendor note, check the wording is correct in breadcrumbs
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, should be nicely translatable now.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit fda9976cda1669eb12feaeee9e900c5eb962e9ea
Author: Mathieu Saby <mathsabypro at gmail.com>
Date:   Sat Apr 19 20:34:42 2014 +0200

    Bug 12111: Improving templates regarding order notes
    
    This bug changes some lines in modordernotes.tt to make them more easily
    translatable, especially in german (remark by K. Fisher on bug 9416).
    No change should be visible
    
    It also suppresses the ability to edit order "vendor note" in reception,
    as the note for vendor is not made to be changed after the document is
    received.
    
    Test plan :
    - in a basket, try to edit the notes (internal and vendor) of order.
      Check the display is correct
    - go in reception module (parcel.pl page) : in the list of all orders
      to receive, you should have a link to change "internal note", but no
      more link to change "vendor note"
    - try to receive a specific order which have a "vendor note". On the
      right panel of the page, you must have an editable textarea for
      internal note, and a non-editable (colored in grey) textarea for
      vendor note
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

-----------------------------------------------------------------------

Summary of changes:
 acqui/finishreceive.pl                                   |    2 --
 .../intranet-tmpl/prog/en/modules/acqui/modordernotes.tt |   14 ++++++++++++--
 .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt  |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository