From: Bill Erickson Date: Fri, 23 Sep 2011 21:41:35 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into acq-po-activation-sans... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2d295cb0f9f26b72cc0e3f2fbb50c372fb772e4f;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into acq-po-activation-sans-assets --- 2d295cb0f9f26b72cc0e3f2fbb50c372fb772e4f diff --cc Open-ILS/src/templates/acq/common/li_table.tt2 index 0000000000,8f078aba07..4e69480cae mode 000000,100644..100644 --- a/Open-ILS/src/templates/acq/common/li_table.tt2 +++ b/Open-ILS/src/templates/acq/common/li_table.tt2 @@@ -1,0 -1,474 +1,474 @@@ + + + +
+ + + + [% INCLUDE "acq/common/info.tt2" which = "Lit" %] + + + [% INCLUDE "acq/common/notes.tt2" which = "Lit" %] + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + +
+ + +
+
+ + + + +
+ diff --cc Open-ILS/src/templates/acq/po/view.tt2 index 0000000000,55f66797f8..f6d249ac21 mode 000000,100644..100644 --- a/Open-ILS/src/templates/acq/po/view.tt2 +++ b/Open-ILS/src/templates/acq/po/view.tt2 @@@ -1,0 -1,138 +1,142 @@@ + [% WRAPPER 'base.tt2' %] + [% ctx.page_title = "Purchase Order" %] +
+
+
+ + Purchase Order () + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IDPrepayment Required?
NameActivatable? + - ++ +
ProviderNotes + +
Total LineitemsEDI Messages + +
Total Estimated$History + +
Total Encumbered$Invoicing
Total Spent$ + + +
+ +
+
+
+ + + + + [% INCLUDE 'acq/common/li_table.tt2' %] + [% INCLUDE "acq/common/notes.tt2" which = "Po" %] + + [% INCLUDE "acq/po/item_table.tt2" %] +
+ [% END %]