From bf89b7465dcfb81c7f2f3e29cc8ca666602698ed Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 23 Jun 2015 10:55:52 -0400 Subject: [PATCH] JBAS-773 Merge custom PO view changes to stock Use stock PO view code with custom changes instead of using custom files which are getting out of sync. Signed-off-by: Bill Erickson Conflicts: KCLS/openils/var/templates_kcls/acq/po/view.tt2 Open-ILS/web/js/ui/default/acq/po/view_po.js Open-ILS/web/js/ui/kcls/acq/po/view_po.js --- KCLS/openils/var/templates_kcls/acq/po/view.tt2 | 165 ------ Open-ILS/src/templates/acq/po/view.tt2 | 4 +- Open-ILS/web/js/ui/default/acq/po/view_po.js | 7 +- Open-ILS/web/js/ui/kcls/acq/po/view_po.js | 749 ------------------------ 4 files changed, 7 insertions(+), 918 deletions(-) delete mode 100644 KCLS/openils/var/templates_kcls/acq/po/view.tt2 delete mode 100644 Open-ILS/web/js/ui/kcls/acq/po/view_po.js diff --git a/KCLS/openils/var/templates_kcls/acq/po/view.tt2 b/KCLS/openils/var/templates_kcls/acq/po/view.tt2 deleted file mode 100644 index ce58e62a51..0000000000 --- a/KCLS/openils/var/templates_kcls/acq/po/view.tt2 +++ /dev/null @@ -1,165 +0,0 @@ -[% WRAPPER 'base.tt2' %] -[% ctx.page_title = l("Purchase Order") %] -
-
-
-
- - [% l('Purchase Order ([_1])', '') %] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[% l('ID') %][% l('Prepayment Required?') %]
[% l('Name') %][% l('Activatable?') %] - - - -
[% l('Provider') %][% l('Notes') %] - -
[% l('Total Lineitems') %][% l('EDI Messages') %] - -
[% l('Total Estimated') %][% l('$[_1]', '') %][% l('History') %] - -
[% l('Total Encumbered') %][% l('$[_1]', '') %]
[% l('Total Spent') %][% l('$[_1]', '') %] - - -
- - -
- -
-
-
- - - - - [% INCLUDE 'acq/common/li_table.tt2' %] - [% INCLUDE "acq/common/notes.tt2" which = "Po" %] - - [% INCLUDE "acq/po/item_table.tt2" %] -
-[% END %] diff --git a/Open-ILS/src/templates/acq/po/view.tt2 b/Open-ILS/src/templates/acq/po/view.tt2 index 2bed1ee089..aa0cf1a12a 100644 --- a/Open-ILS/src/templates/acq/po/view.tt2 +++ b/Open-ILS/src/templates/acq/po/view.tt2 @@ -27,11 +27,11 @@