Attachment 3631 Details for Bug 5991 – Signed off patch

[patch] Signed off patch

0001-SIGNED-OFF-Fix-for-Bug-5991-Javascript-error-on-purc.patch (text/plain), 3.27 KB, created by Katrin Fischer on 2011-04-04 14:13:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2011-04-04 14:13:01 UTC

Size: 3.27 KB

patch

obsolete

>From 4ea750881728c134431efbb57bd8846b9495a215 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 29 Mar 2011 14:37:49 -0400
>Subject: [PATCH] [SIGNED-OFF] Fix for Bug 5991 - Javascript error on purchase suggestion pages
>Content-Type: text/plain; charset="utf-8"
>
>Rebased on master 2011-04-04
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    2 +-
> .../prog/en/modules/suggestion/suggestion.tmpl     |   11 ++++++++---
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
>index b5ec994..de9e92c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
>+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
>@@ -695,7 +695,7 @@ function calcNewsuggTotal(){
>     var total =  new Number(quantity*price*exchangerate);
> 
>     document.getElementById('total').value = total.toFixed(2);
>-    document.getElementById('price').value =  listprice.toFixed(2);
>+    document.getElementById('price').value =  price.toFixed(2);
>     return true;
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
>index cf38b72..3d7817e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
>@@ -4,7 +4,7 @@
> 
>  <script type="text/javascript" src="/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
> <script type="text/javascript" src="/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
>-<script type="text/JavaScript">
>+<script type="text/javascript">
> // <![CDATA[
> 
>     function yuiToolbar() {
>@@ -79,11 +79,16 @@ $(document).ready(function() {
> <style type="text/css">
> h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; }
> .overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("/intranet-tmpl/prog/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; }
>-</style>
>+</style>
>+<script type="text/javascript">
>+// <![CDATA[
>+$(document).ready(function() { calcNewsuggTotal(); });
>+// ]]>
>+</script>
> 
> <script type="text/javascript" src="/js/acq.js"></script>
> </head>
>-<body onload="calcNewsuggTotal();">
>+<body>
> 
> 
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> &rsaquo; Suggestion edit #New purchase suggestionSuggestions Management </div>
>-- 
>1.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 5991: 3503 | 3622 | 3631