[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.10-11-ge199333

[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, 3.14.x has been updated
       via  e1993334cff347b688d6164f6fb631e68258876c (commit)
       via  6efe23ba8f9ee248237fd0ffd04ec426b7c9ea2b (commit)
      from  192596530321c68a2b4d9bbdafa06b4fc9f3b95e (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 e1993334cff347b688d6164f6fb631e68258876c
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Jul 25 09:38:24 2013 +0200

    Bug 11864: Show parent order line in received orders table
    
    Test plan:
    1/ Go to the receipt page of a bookseller
    2/ Choose an invoice for which you have already partially
       received some orders (or create an order an receive it
       partially)
    3/ In the received orders table, under column Order line,
       you should now see the parent order line number in
       parenthesis
    
    Signed-off-by: remy juliette <juliette.levast at iepg.fr>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 51c0e46033fffcbb07fb5456640e35fb41623707)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 6efe23ba8f9ee248237fd0ffd04ec426b7c9ea2b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Jul 25 09:25:21 2013 +0200

    Bug 11864: (code cleanup) re-indent parcel.tt and rename a variable
    
    Signed-off-by: remy juliette <juliette.levast at iepg.fr>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Fixed 2 additional tabs.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 906b7deffe88bf245d1b21c1e3b8df800034db2e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   83 +++++++++++---------
 1 file changed, 44 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
main Koha release repository