Attachment 160183 Details for Bug 35044 – Bug 35044: Update: Invoices

[patch] Bug 35044: Update: Invoices

Bug-35044-Update-Invoices.patch (text/plain), 5.75 KB, created by Martin Renvoize (ashimema) on 2023-12-21 10:28:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-12-21 10:28:37 UTC

Size: 5.75 KB

patch

obsolete

>From c8e497aaa00f23c406bb019268cd824bbf2d8426 Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Date: Mon, 16 Oct 2023 14:34:51 +0000
>Subject: [PATCH] Bug 35044: Update: Invoices
>
>Added fixme comment to invoices.tt, the search works so nothing to do here, but the code is not DRY
>
>Test plan, k-t-d:
>
>Preparation: Create additional fields for table 'aqinvoices':
>2 text fields, one repeatable, one not-repeatable
>2 AV fields, one repeatable, one not-repeatable
>
>1) Add a new invoice for an existing vendor, visit:
>/cgi-bin/koha/acqui/parcels.pl?booksellerid=1
>2) Input something in the mandatory "Vendor invoice" field.
>3) Fill in all additional fields, click the '+New' and 'Clear' links,  hit 'Save'
>4) Search for invoices, visit:
>http://localhost:8081/cgi-bin/koha/acqui/invoices.pl
>5) Click "Search" on the left column of the page
>6) Click the invoice we just created. Verify all the fields show correctly.
>7) Go back to the additional fields configuration, set all additional fields as "searchable"
>8) Return to http://localhost:8081/cgi-bin/koha/acqui/invoices.pl
>9) Perform some searches using the additional fields values.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> acqui/invoice.pl                                 | 16 ++++++++--------
> acqui/parcels.pl                                 |  6 +++---
> .../prog/en/modules/acqui/invoice.tt             |  1 +
> .../prog/en/modules/acqui/invoices.tt            |  1 +
> .../prog/en/modules/acqui/parcels.tt             |  1 +
> 5 files changed, 14 insertions(+), 11 deletions(-)
>
>diff --git a/acqui/invoice.pl b/acqui/invoice.pl
>index b9d1bf5d0b9..dc15c7c2c78 100755
>--- a/acqui/invoice.pl
>+++ b/acqui/invoice.pl
>@@ -131,11 +131,13 @@ elsif ( $op && $op eq 'mod' ) {
>     my @additional_fields;
>     my $invoice_fields = Koha::AdditionalFields->search({ tablename => 'aqinvoices' });
>     while ( my $field = $invoice_fields->next ) {
>-        my $value = $input->param('additional_field_' . $field->id);
>-        push @additional_fields, {
>-            id => $field->id,
>-            value => $value,
>-        };
>+        my @field_values = $input->param( 'additional_field_' . $field->id );
>+        foreach my $value (@field_values) {
>+            push @additional_fields, {
>+                id    => $field->id,
>+                value => $value,
>+            } if $value;
>+        }
>     }
>     Koha::Acquisition::Invoices->find($invoiceid)->set_additional_fields(\@additional_fields);
> 
>@@ -320,9 +322,7 @@ if ( $adjustments ) { $template->param( adjustments => $adjustments ); }
> my $invoice = Koha::Acquisition::Invoices->find($invoiceid);
> $template->param(
>     available_additional_fields => Koha::AdditionalFields->search( { tablename => 'aqinvoices' } ),
>-    additional_field_values => { map {
>-                $_->field->id => $_->value
>-            } $invoice->additional_field_values->as_list },
>+    additional_field_values => $invoice->get_additional_field_values_for_template,
> );
> 
> $template->param(
>diff --git a/acqui/parcels.pl b/acqui/parcels.pl
>index 985947ef56b..08af94f8951 100755
>--- a/acqui/parcels.pl
>+++ b/acqui/parcels.pl
>@@ -134,12 +134,12 @@ if ($op and $op eq 'confirm') {
>         my @additional_fields;
>         my $invoice_fields = Koha::AdditionalFields->search({ tablename => 'aqinvoices' });
>         while ( my $field = $invoice_fields->next ) {
>-            my $value = $input->param('additional_field_' . $field->id);
>-            if (defined $value) {
>+            my @field_values = $input->param( 'additional_field_' . $field->id );
>+            foreach my $value (@field_values) {
>                 push @additional_fields, {
>                     id    => $field->id,
>                     value => $value,
>-                };
>+                } if $value;
>             }
>         }
>         if (@additional_fields) {
>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 9610fdd88af..c490eaef28f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>@@ -538,6 +538,7 @@
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>     [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %]
>     [% Asset.js("js/acq.js") | $raw %]
>+    [% Asset.js("js/additional-fields-entry.js") | $raw %]
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>     <script>
>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 7e160a8318d..ffd8786faa5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>@@ -390,6 +390,7 @@
>                                     [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
>                                 </select>
>                             </li>
>+                        [%# FIXME additional-fields.entry.inc should/could be considered here %]
>                         [% FOR field IN additional_fields_for_invoice %]
>                             <li>
>                                 <label for="additional_field_[% field.id | html %]ID"> [% field.name | html %]: </label>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>index 915bf002a57..a0d4b436b46 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>@@ -241,6 +241,7 @@
> 
> [% MACRO jsinclude BLOCK %]
>     [% Asset.js("js/acquisitions-menu.js") | $raw %]
>+    [% Asset.js("js/additional-fields-entry.js") | $raw %]
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>     <script>
>-- 
>2.43.0

Actions: View | Diff | Splinter Review

Attachments on bug 35044: 157324 | 157325 | 157326 | 157327 | 157328 | 157329 | 157330 | 157331 | 157332 | 157333 | 157334 | 158113 | 158498 | 158499 | 158500 | 158501 | 158502 | 158503 | 158504 | 158505 | 158506 | 158507 | 158508 | 158857 | 158858 | 158859 | 158860 | 158861 | 158862 | 158863 | 158864 | 158865 | 158866 | 158867 | 158868 | 159268 | 160177 | 160178 | 160179 | 160180 | 160181 | 160182 | 160183 | 160184 | 160185 | 160186 | 160187 | 160188 | 160189 | 164162 | 164163 | 164164 | 164165 | 164166 | 164167 | 164168 | 164169 | 164170 | 164171 | 164172 | 164173 | 164174 | 167690 | 168537 | 168538 | 168539 | 168540 | 168541 | 168542 | 168543 | 168544 | 168545 | 168546 | 168547 | 168548 | 169545 | 169546 | 169547 | 169603 | 169604 | 169605 | 169606 | 169607 | 169643 | 169644 | 169645 | 169646 | 169647 | 169648 | 169649 | 169650 | 169651 | 169652 | 169653 | 169654 | 169655 | 169656 | 169657 | 169658 | 169659 | 169660 | 169661 | 169662 | 169663 | 169664 | 169665 | 169666 | 169667 | 169668 | 169669 | 169670 | 169671 | 169672 | 169673 | 169674 | 169675 | 169676 | 169677 | 169678 | 169679 | 169680 | 169681 | 169682 | 169683 | 169684 | 169697 | 170501