[open-ils-commits] [GIT] Evergreen ILS branch master updated. f36015dba1d2f6ec0d3b37bafda10a98507f631f

[Evergreen Git]

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 "Evergreen ILS".

The branch, master has been updated
       via  f36015dba1d2f6ec0d3b37bafda10a98507f631f (commit)
       via  b5ba0fa47f5a19d5277326cdbba21d5ba951745c (commit)
      from  6687b1bc4bd4c4039e31bd758f6bd7d9ba3dbfbd (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 f36015dba1d2f6ec0d3b37bafda10a98507f631f
Author: Bill Erickson <berickxx at gmail.com>
Date:   Mon Oct 12 15:54:02 2015 -0400

    LP#1501516 'paid' lineitem release notes
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Christine Burns <christine.burns at bc.libraries.coop>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/docs/RELEASE_NOTES_NEXT/Acquisitions/acq-li-paid-label.txt b/docs/RELEASE_NOTES_NEXT/Acquisitions/acq-li-paid-label.txt
new file mode 100644
index 0000000..231cd07
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Acquisitions/acq-li-paid-label.txt
@@ -0,0 +1,4 @@
+PO Lineitem "paid" label
+^^^^^^^^^^^^^^^^^^^^^^^^
+A new "paid" label appears along the bottom of each lineitem in the PO 
+display when every non-canceled copy on the lineitem has been invoiced.

commit b5ba0fa47f5a19d5277326cdbba21d5ba951745c
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu Oct 1 11:51:43 2015 -0400

    LP#1501516 PO lineitem 'paid' indicator
    
    Display a new "paid" label for each lineitem within a purchase
    order whose items have all been invoiced (or canceled).
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Christine Burns <christine.burns at bc.libraries.coop>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index 5dbba8e..40546c8 100644
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -187,6 +187,7 @@
                                         <span name="claim_policy" class="hidden"> | [% l("claim policy:") %] <span name="claim_policy_name"></span></span>
                                         <span name='pro' class='hidden'> | <a title='[% l('Provider') %]' name='pro_link' href='javascript:void(0);'>&#x235F; </a></span>
                                         <span name='queue' class='hidden'> | <a title='[% l('Import Queue') %]' name='queue_link' href='javascript:void(0);'>[% l('&#x27AC; queue') %]</a></span>
+                                        <span name='paid' class='hidden'> | <span class="acq-existing-count-warn">[% l('Paid') %]</span></span>
                                     </td>
                                 </tr>
                             </tbody>
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 4eda197..68d9a67 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -775,6 +775,20 @@ function AcqLiTable() {
         dojo.query('[name=expand_inline_copies]', row)[0].onclick = 
             function() {self.drawInlineCopies(li.id())};
 
+        var sum;
+        if (sum = li.order_summary()) { // assignment
+            // Only show the paid label if at least one copy is invoiced.
+            // In other words, a lineitem whose every copy is canceled
+            // is not "paid off"
+            if (sum.invoice_count() > 0) {
+                if (sum.item_count() == (
+                    sum.invoice_count() + sum.cancel_count())) {
+                    // Lineitem is fully paid.  Display the paid-off label
+                    openils.Util.show(nodeByName('paid', row), 'inline');
+                }
+            }
+        }
+
         this.drawOrderIdentSelector(li, row);
 
         if (!this.skipInitialEligibilityCheck)
diff --git a/Open-ILS/web/js/ui/default/acq/po/view_po.js b/Open-ILS/web/js/ui/default/acq/po/view_po.js
index 10e063e..53989cc 100644
--- a/Open-ILS/web/js/ui/default/acq/po/view_po.js
+++ b/Open-ILS/web/js/ui/default/acq/po/view_po.js
@@ -483,7 +483,12 @@ function init2() {
             params: [
                 openils.User.authtoken, 
                 [{purchase_order:poId}, {"order_by": {"jub": "id ASC"}}], 
-                {flesh_attrs:true, flesh_notes:true, flesh_cancel_reason:true, clear_marc:true}
+                {   flesh_attrs : true,
+                    flesh_notes : true,
+                    flesh_cancel_reason : true,
+                    flesh_order_summary : true,
+                    clear_marc:true
+                }
             ],
             onresponse: function(r) {
                 liTable.show('list');

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

Summary of changes:
 Open-ILS/src/templates/acq/common/li_table.tt2     |    1 +
 Open-ILS/web/js/ui/default/acq/common/li_table.js  |   14 ++++++++++++++
 Open-ILS/web/js/ui/default/acq/po/view_po.js       |    7 ++++++-
 .../Acquisitions/acq-li-paid-label.txt             |    4 ++++
 4 files changed, 25 insertions(+), 1 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/acq-li-paid-label.txt


hooks/post-receive
-- 
Evergreen ILS