From 3105c52380d3d9a11f84d9844fb6f13d415d39e5 Mon Sep 17 00:00:00 2001 From: Solene Desvaux Date: Thu, 31 Mar 2022 11:25:34 +0200 Subject: [PATCH] Bug 30952: Acquisition Module --- .../prog/en/modules/acqui/acqui-home.tt | 29 +++++++++++++------ .../prog/en/modules/acqui/edifactmsgs.tt | 14 +++++++-- .../prog/en/modules/acqui/invoice.tt | 5 +++- .../prog/en/modules/acqui/invoices.tt | 14 +++++++-- .../prog/en/modules/acqui/lateorders.tt | 6 ++-- 5 files changed, 52 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index e7041bf479..c0b5549b32 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -4,6 +4,9 @@ [% USE Branches %] [% USE TablesSettings %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'acquisitions-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -11,8 +14,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'acquisitions-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
@@ -48,13 +58,14 @@
[% END %]
-
- Manage orders -
-

- -

-
+
+

Manage orders

+
+
+

Vendor: +

+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index 2d2bd5e064..316aec2624 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -2,6 +2,9 @@ [% USE Asset %] [% USE KohaDates %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'acquisitions-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] EDIFACT messages › Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -11,8 +14,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'acquisitions-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 27c57bf0e2..0c42bec5cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -4,6 +4,9 @@ [% USE KohaDates %] [% USE Price %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'acquisitions-search.inc' %] +[% END %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] @@ -12,7 +15,7 @@ -[% INCLUDE 'header.inc' %] +[% INCLUDE 'header.inc' form=formulaire %] [% INCLUDE 'acquisitions-search.inc' %] [% SET readonly = NOT CAN_user_acquisition_edit_invoices %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index e54e8e0756..2600ed07f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -3,6 +3,9 @@ [% USE KohaDates %] [% USE Branches %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'acquisitions-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Invoices › Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -10,8 +13,7 @@ -[% INCLUDE 'header.inc' %] -[% INCLUDE 'acquisitions-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 03862a2261..1c3209a778 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -5,14 +5,16 @@ [% USE TablesSettings %] [% USE Price %] [% SET footerjs = 1 %] +[% formulaire = BLOCK %] + [% INCLUDE 'acquisitions-search.inc' %] +[% END %] [% INCLUDE 'doc-head-open.inc' %] Late orders › Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'header.inc' %] -[% INCLUDE 'acquisitions-search.inc' %] +[% INCLUDE 'header.inc' form=formulaire %]