Bugzilla – Attachment 139843 Details for
Bug 15348
Change/Edit estimated delivery date per order line
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15348: (follow-up) Move estimated delivery date before supplier report and fix column settings
Bug-15348-follow-up-Move-estimated-delivery-date-b.patch (text/plain), 4.41 KB, created by
Katrin Fischer
on 2022-08-26 16:32:13 UTC
(
hide
)
Description:
Bug 15348: (follow-up) Move estimated delivery date before supplier report and fix column settings
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-08-26 16:32:13 UTC
Size:
4.41 KB
patch
obsolete
>From 9d6d42ed1e1c719bb57f039af4f0534d964dedd1 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer@bsz-bw.de> >Date: Wed, 17 Aug 2022 10:03:22 +0000 >Subject: [PATCH] Bug 15348: (follow-up) Move estimated delivery date before > supplier report and fix column settings > >On the basket summary page the estimated delivery date column was >moved before the supplier report column, that is only visible >when EDIFACT has been activated. > >It also adds the new column to the table configuration. > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > admin/columns_settings.yml | 2 ++ > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 12 ++++++------ > 2 files changed, 8 insertions(+), 6 deletions(-) > >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index 18b2f239ff..08c2695497 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -150,6 +150,8 @@ modules: > columnname: goods_and_services_tax > - > columnname: fund >+ - >+ columnmame: estimated_delivery_date > - > columnname: supplier_report > - >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 02c785c73a..aff9d364a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -448,10 +448,10 @@ > <th>GST %</th> > <th>GST</th> > <th>Fund</th> >+ <th>Estimated delivery date</th> > [% IF Koha.Preference('EDIFACT') && ediaccount %] > <th>Supplier report</th> > [% END %] >- <th>Estimated delivery date</th> > [% IF ( active ) %] > [% UNLESS ( closedate ) %] > <th class="NoSort">Modify</th> >@@ -478,10 +478,10 @@ > <th> </th> > <th>[% foot_loo.tax_value | $Price %]</th> > <th> </th> >+ <th>[% foot_loo.estimated_delivery_date | $KohaDates %]</th> > [% IF Koha.Preference('EDIFACT') && ediaccount %] > <th> </th> > [% END %] >- <th>[% foot_loo.estimated_delivery_date | $KohaDates %]</th> > [% IF ( active ) %] > [% UNLESS ( closedate ) %] > <th> </th> >@@ -506,10 +506,10 @@ > <th> </th> > <th>[% total_tax_value | $Price %]</th> > <th> </th> >+ <th>[% estimated_delivery_date | $KohaDates %]</th> > [% IF Koha.Preference('EDIFACT') && ediaccount %] > <th> </th> > [% END %] >- <th>[% estimated_delivery_date | $KohaDates %]</th> > [% IF ( active ) %] > [% UNLESS ( closedate ) %] > <th> </th> >@@ -593,9 +593,6 @@ > <td class="number">[% books_loo.tax_rate * 100 | html %]</td> > <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td> > <td>[% books_loo.budget_name | html %]</td> >- [% IF Koha.Preference('EDIFACT') && ediaccount %] >- <td>[% books_loo.suppliers_report | html %]</td> >- [% END %] > <td class="actions"> > [% books_loo.estimated_delivery_date | $KohaDates %] > [% IF CAN_user_acquisition_order_manage %] >@@ -603,6 +600,9 @@ > <i class="fa fa-pencil"></i> Edit > </a> > </td> >+ [% IF Koha.Preference('EDIFACT') && ediaccount %] >+ <td>[% books_loo.suppliers_report | html %]</td> >+ [% END %] > [% END %] > [% IF ( active ) %] > [% UNLESS ( closedate ) %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15348
:
114430
|
114583
|
114623
|
115121
|
115122
|
115123
|
115124
|
116517
|
118788
|
118789
|
119297
|
119298
|
119299
|
120653
|
120654
|
120655
|
120656
|
136560
|
136561
|
136562
|
136563
|
137057
|
137058
|
137061
|
137098
|
137099
|
137740
|
137741
|
137742
|
137743
|
138110
|
138491
|
138529
|
138530
|
138531
|
138532
|
138533
|
138534
|
138535
|
138536
|
138537
|
138538
|
138539
|
138540
|
139245
|
139274
|
139301
|
139329
|
139330
|
139331
|
139332
|
139333
|
139334
|
139335
|
139336
|
139337
|
139338
|
139339
|
139340
|
139341
|
139342
|
139343
|
139351
|
139352
|
139353
|
139354
|
139355
|
139356
|
139357
|
139358
|
139359
|
139360
|
139361
|
139362
|
139363
|
139364
|
139365
|
139831
|
139832
|
139833
|
139834
|
139835
|
139836
|
139837
|
139838
|
139839
|
139840
|
139841
|
139842
| 139843 |
139844
|
139845
|
140708
|
140735
|
143896
|
143900
|
143903
|
143904