Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity
Koha/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt

273 lines
12 KiB
Text
Raw Normal View History

Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
[% USE raw %]
Bug 20538: Remove the need of writing [% KOHA_VERSION %] everywhere Having to write [% KOHA_VERSION %] for each url is bad because: - It's easily forgettable when adding new <script> or <link> - It prevents grep'ing for the full filename - It violates the DRY principle - If at some point we want to change the "force js and css reload" mechanism, it will be tedious This patch: - adds a Template::Toolkit plugin that generates <script> and <link> tags for JS and CSS files, and inserts automatically the Koha version in the filename - use the new plugin to remove all occurences of [% KOHA_VERSION %] - remove the code that was adding KOHA_VERSION as a template variable Test plan: 1. Apply patch 2. Go to several different pages in Koha (opac and intranet) while checking your browser's dev tools (there should be no 404 for JS and CSS files, and the Koha version should appear in filenames) and the server logs (there should be no "File not found") 3. `git grep KOHA_VERSION` should return nothing 4. prove t/db_dependent/Koha/Template/Plugin/Asset.t Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2018-04-06 15:02:55 +00:00
[% USE Asset %]
Bug 10366: Alert librarian if an invoice number is duplicated Some vendors ship materials from the same invoice in multiple packages. In those cases, it would be good to notify the librarian when they enter a duplicate invoice number, so that they can continue receiving on the previously-created invoice, rather than creating an invoice with a duplicate number. To test: 1) Apply patch and run database update. 2) Make sure that you have created at least one invoice on acqui/parcels.pl and take note of the invoice number. 3) Try to create an invoice with the same invoice number. 4) Note that without changing your configuration this works exactly the same as before. 5) Turn on the AcqWarnOnDuplicateInvoice system preference. 6) Try to create a new invoice with the same number as the one you noted earlier. 7) Make sure you get a warning about a duplicate invoice. 8) Choose to receive on the existing invoice. 9) Confirm that you are receiving on said existing invoice. 10) Start the receiving process over, and this time choose "Create new invoice anyway." 11) Confirm that you are now receiving on a new invoice. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. I have followed the test plan, but also checked some more things: - Checking the duplicate check works when you have the entered invoice number in your database multiple times already. - Checking that no duplicate message is shown if you enter the invoice number and it's already been used for an invoice from another vendor. Looks all good. I think the only thing we could argue about here is if this could be activated by default for new installations. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-29 03:03:59 +00:00
[% USE KohaDates %]
Bug 34434: Terminology: Biblio should be bibliographic This patch corrects several more instances where the templates use the term "biblio" where it should use "bibliographic." To test, apply the patch and confirm that these instances read correctly: - About -> Special thanks... -> Mines Paristech: "bibliographic frameworks" - Acquisitions -> Vendor -> Receive shipments: "Record count" in the table of shipments. - Catalogue -> Bibliographic record details -> Labeled MARC: "Labeled MARC record" heading. - Circulation -> Holds to pull: Error message, "hold has been placed at the bibliographic record level." * I'm not sure how one can trigger this error message. - Tools -> Log viewer -> Filter by "Catalog" and "Add": "Bibliographic record..." link in the "Object" column. Signed-off-by: Sam Lau <samalau@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-07-27 15:12:12 +00:00
[% PROCESS 'i18n.inc' %]
Bug 19755: Move template JavaScript to the footer: Acquisitions, part 3 This patch modifies even more staff client acquisitions templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Acquisitions -> Vendor -> Vendor details - Contracts datatable - Edit vendor - Add contacts, form validation - Acquisitions -> Vendor -> Invoices -> Invoice -> "Go to receipt" - Datatables, MARC and Card previews - Transfer - Confirmation of transfer, window closes - Acquisitions -> Vendor -> Receive shipments - Datatables, date pickers - Acquisitions -> Available funds table -> Spent report - Datatables - Acquisitions -> Vendor -> Uncertain prices - Datatables, form validation - Acquisitions -> Vendor -> Basket -> Add to basket from external source - Select and clear all on search form - Search results - Datatables, MARC and Card previews, in-table pop-up controls (click any table cell) Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2017-12-05 18:30:08 +00:00
[% SET footerjs = 1 %]
Bug 33908: Improve translation of title tags: Acquisitions This patch updates acquisitions, suggestions, and ERM templates so that title tags can be more easily translated. To test, apply the patch and confirm that the following pages have the correct title tags: - Acquisitions -> Acquisitions home - Ordered - Spent - Vendors: Search, new, edit - Baskets: New, edit - New order - From an empty record - From an existing record - From existing orders (copy) - From a suggestion - From a subscription - From an external source - From a staged file - Basket groups - Receive shipments - Uncertain prices - Late orders - Suggestions - Invoices - Invoice details - Invoice files - Receive orders - Transfer order - Cancel order - EDIFACT messages - Order search - ERM Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-06-06 14:59:36 +00:00
[% PROCESS 'i18n.inc' %]
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% INCLUDE 'doc-head-open.inc' %]
Bug 33908: Improve translation of title tags: Acquisitions This patch updates acquisitions, suggestions, and ERM templates so that title tags can be more easily translated. To test, apply the patch and confirm that the following pages have the correct title tags: - Acquisitions -> Acquisitions home - Ordered - Spent - Vendors: Search, new, edit - Baskets: New, edit - New order - From an empty record - From an existing record - From existing orders (copy) - From a suggestion - From a subscription - From an external source - From a staged file - Basket groups - Receive shipments - Uncertain prices - Late orders - Suggestions - Invoices - Invoice details - Invoice files - Receive orders - Transfer order - Cancel order - EDIFACT messages - Order search - ERM Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-06-06 14:59:36 +00:00
<title>[% FILTER collapse %]
[% tx("Receive shipment from vendor {vendor}", { vendor = name }) | html %] &rsaquo;
[% t("Acquisitions") | html %] &rsaquo;
[% t("Koha") | html %]
[% END %]</title>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% INCLUDE 'doc-head-close.inc' %]
</head>
Bug 19755: Move template JavaScript to the footer: Acquisitions, part 3 This patch modifies even more staff client acquisitions templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Acquisitions -> Vendor -> Vendor details - Contracts datatable - Edit vendor - Add contacts, form validation - Acquisitions -> Vendor -> Invoices -> Invoice -> "Go to receipt" - Datatables, MARC and Card previews - Transfer - Confirmation of transfer, window closes - Acquisitions -> Vendor -> Receive shipments - Datatables, date pickers - Acquisitions -> Available funds table -> Spent report - Datatables - Acquisitions -> Vendor -> Uncertain prices - Datatables, form validation - Acquisitions -> Vendor -> Basket -> Add to basket from external source - Select and clear all on search form - Search results - Datatables, MARC and Card previews, in-table pop-up controls (click any table cell) Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2017-12-05 18:30:08 +00:00
Bug 7760: Add unique ids and a module class to all acquisitions pages This is the first patch for bug 7760 and touches all pages in acquisitions. This adds a unique id "acq_<filename>" and a class "acq" to the body tag of each page in acquisitions. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-20 15:41:17 +00:00
<body id="acq_parcels" class="acq">
Bug 30952: Staff interface redesign (header) What this patch does: - change the navigation bar style - change the breadcrumbs style - change the "last borrower" link style - move the search bar inside the navigation bar - move the help link to the same row as the breadcrumbs Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-07-25 14:37:41 +00:00
[% WRAPPER 'header.inc' %]
[% INCLUDE 'acquisitions-search.inc' %]
[% END %]
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
Bug 30952: Staff interface redesign (header) What this patch does: - change the navigation bar style - change the breadcrumbs style - change the "last borrower" link style - move the search bar inside the navigation bar - move the help link to the same row as the breadcrumbs Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-07-25 14:37:41 +00:00
[% WRAPPER 'sub-header.inc' %]
Bug 33005: Use template wrapper for breadcrumbs: Acquisitions part 3 This patch updates several acquisitions-related templates so that they use the new WRAPPER for displaying breadcrumbs. To test, apply the patch and test each page and its variations. Breadcrumbs should look correct, and each link should be correct. - Acquisitions -> -> All available funds table -> Ordered -> Spent -> Vendor -> Vendor details -> Uncertain prices -> Receive shipments (must have at least one open basket) -> If necessary, receive a new shipment. Or click an invoice number to reach the "receive orders" page. -> Click "Receive" in the table listing baskets. -> Basket -> Add to basket -> From a suggestion -> From an external source Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-01-06 11:50:00 +00:00
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
Bug 27846: modules and modules/acqui folders Modified breadcrumbs to be accessible, in particular for a screen-reader. Made the block of breadcrumbs be a <nav aria label="Breadcrumb" class="breadcrumb"> with an ordered list inside. The last breadcrumbs also has aria-current="page" to specify that it is the current page. To test: 1) Apply patch 2) Build scss file 3) Ensure each of the files in the modules folder and the modules/acqui folder has breadcrumbs that are in a <nav aria label="Breadcrumb" class="breadcrumb"> block 4) Ensure that there is an ordered list in the block of breadcrumbs 5) Ensure that the last breadcrumb has aria-current="page" 6) Ensure that the breadcrumbs on each page of the staff client belonging to these files look the same as before, but the '>' symbol is replaced with '/' and the last breadcrumb has bold text 7) Ensure that when the last breadcrumb is clicked it takes you to the page you are currently on Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2021-03-11 02:40:25 +00:00
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
Bug 33005: Use template wrapper for breadcrumbs: Acquisitions part 3 This patch updates several acquisitions-related templates so that they use the new WRAPPER for displaying breadcrumbs. To test, apply the patch and test each page and its variations. Breadcrumbs should look correct, and each link should be correct. - Acquisitions -> -> All available funds table -> Ordered -> Spent -> Vendor -> Vendor details -> Uncertain prices -> Receive shipments (must have at least one open basket) -> If necessary, receive a new shipment. Or click an invoice number to reach the "receive orders" page. -> Click "Receive" in the table listing baskets. -> Basket -> Add to basket -> From a suggestion -> From an external source Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-01-06 11:50:00 +00:00
[% END %]
[% WRAPPER breadcrumb_item %]
Bug 27846: modules and modules/acqui folders Modified breadcrumbs to be accessible, in particular for a screen-reader. Made the block of breadcrumbs be a <nav aria label="Breadcrumb" class="breadcrumb"> with an ordered list inside. The last breadcrumbs also has aria-current="page" to specify that it is the current page. To test: 1) Apply patch 2) Build scss file 3) Ensure each of the files in the modules folder and the modules/acqui folder has breadcrumbs that are in a <nav aria label="Breadcrumb" class="breadcrumb"> block 4) Ensure that there is an ordered list in the block of breadcrumbs 5) Ensure that the last breadcrumb has aria-current="page" 6) Ensure that the breadcrumbs on each page of the staff client belonging to these files look the same as before, but the '>' symbol is replaced with '/' and the last breadcrumb has bold text 7) Ensure that when the last breadcrumb is clicked it takes you to the page you are currently on Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2021-03-11 02:40:25 +00:00
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
Bug 33005: Use template wrapper for breadcrumbs: Acquisitions part 3 This patch updates several acquisitions-related templates so that they use the new WRAPPER for displaying breadcrumbs. To test, apply the patch and test each page and its variations. Breadcrumbs should look correct, and each link should be correct. - Acquisitions -> -> All available funds table -> Ordered -> Spent -> Vendor -> Vendor details -> Uncertain prices -> Receive shipments (must have at least one open basket) -> If necessary, receive a new shipment. Or click an invoice number to reach the "receive orders" page. -> Click "Receive" in the table listing baskets. -> Basket -> Add to basket -> From a suggestion -> From an external source Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-01-06 11:50:00 +00:00
[% END %]
[% WRAPPER breadcrumb_item bc_active= 1 %]
Bug 33005: (follow-up) Add spans for translatability This patch finds places in the updated breadcrumbs markup where a translatable string is isolated in a way that makes it hard for the translation script to find it, and wraps these strings with <span> Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-02-24 12:44:31 +00:00
<span>Receive shipment from vendor [% name | html %]</span>
Bug 33005: Use template wrapper for breadcrumbs: Acquisitions part 3 This patch updates several acquisitions-related templates so that they use the new WRAPPER for displaying breadcrumbs. To test, apply the patch and test each page and its variations. Breadcrumbs should look correct, and each link should be correct. - Acquisitions -> -> All available funds table -> Ordered -> Spent -> Vendor -> Vendor details -> Uncertain prices -> Receive shipments (must have at least one open basket) -> If necessary, receive a new shipment. Or click an invoice number to reach the "receive orders" page. -> Click "Receive" in the table listing baskets. -> Basket -> Add to basket -> From a suggestion -> From an external source Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-01-06 11:50:00 +00:00
[% END %]
[% END #/ WRAPPER breadcrumbs %]
[% END #/ WRAPPER sub-header.inc %]
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
Bug 20690: Update two-column templates with Bootstrap grid: Acquisitions part 4 This patch modifies several acquisitions templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags and "text/css" attributes from <style> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Acquisitions home page -> Click a "spent" value for a fund. - Acquisitions -> Vendor -> Vendor details. - Acquisitions -> Vendor -> Uncertain prices - Acquisitions -> Vendor -> Receive shipments - Click an "Invoice number" link in the table of shipments. - Click "Receive" for one of the titles in pending orders. Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-05-01 15:49:26 +00:00
<div class="main container-fluid">
<div class="row">
[% IF ( count ) %]
<div class="col-sm-10 col-sm-push-2">
[% ELSE %]
<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
[% END %]
<main>
Bug 34862: Include messages.inc Generated using `perl add_blocking_errors.pl` Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
2023-09-21 13:10:48 +00:00
[% INCLUDE 'messages.inc' %]
Bug 27631: acqui folder Changed each of the pages in the acqui folder to have one <h1> tag showing that describes the page, rather than the <h1> describing the logo. The hierarchy of heading tags may be broken in many pages, but this will be dealt with in an additional bug. To test: 1) Go to the Staff Client 2) Apply patch 3) Go to each of the pages in the acqui folder and check that they have an obvious and descriptive heading 4) Ensure that the heading in the page is <h1> Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2021-04-05 21:50:20 +00:00
<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1>
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
[% IF ( error_failed_to_create_invoice ) %]
Bug 13065 - Receive shipment error message incorrectly styled If there is an error during the receive shipment process the error message is incorrectly styled. This patch fixes it. To test you can trigger the error by accessing the page with incorrect or missing parameters: /cgi-bin/koha/acqui/parcels.pl?op=confirm This should trigger the message. Apply the patch and confirm that the error is now styled consistently with others in the staff client. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Small template change, works as described. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-10-10 13:04:27 +00:00
<div id="error" class="dialog alert">
Bug 11170: (follow-up) fix typo 'occured' in parcels.tt Found this typo while testing bug 11170. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-12-16 10:58:32 +00:00
<p>An error has occurred. Invoice cannot be created.</p>
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
</div>
[% END %]
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
Bug 10366: Alert librarian if an invoice number is duplicated Some vendors ship materials from the same invoice in multiple packages. In those cases, it would be good to notify the librarian when they enter a duplicate invoice number, so that they can continue receiving on the previously-created invoice, rather than creating an invoice with a duplicate number. To test: 1) Apply patch and run database update. 2) Make sure that you have created at least one invoice on acqui/parcels.pl and take note of the invoice number. 3) Try to create an invoice with the same invoice number. 4) Note that without changing your configuration this works exactly the same as before. 5) Turn on the AcqWarnOnDuplicateInvoice system preference. 6) Try to create a new invoice with the same number as the one you noted earlier. 7) Make sure you get a warning about a duplicate invoice. 8) Choose to receive on the existing invoice. 9) Confirm that you are receiving on said existing invoice. 10) Start the receiving process over, and this time choose "Create new invoice anyway." 11) Confirm that you are now receiving on a new invoice. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. I have followed the test plan, but also checked some more things: - Checking the duplicate check works when you have the entered invoice number in your database multiple times already. - Checking that no duplicate message is shown if you enter the invoice number and it's already been used for an invoice from another vendor. Looks all good. I think the only thing we could argue about here is if this could be activated by default for new installations. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-29 03:03:59 +00:00
[% IF duplicate_invoices %]
<div id="parcels_duplicate_invoice" class="dialog alert">
<p>This invoice number has already been used. Would you like to receive on an existing invoice?</p>
<table>
Bug 28508: Use "Invoice number" instead of "Invoice no" on the invoice search filter This patch corrects instances of the abbreviated phrase "Invoice no." from the templates, making it "Invoice number." Also corrected: An instance of "Bookseller" is replaced with "Vendor." To test, apply the patch and confirm that the phrase is correct in these cases: - Acquisitions -> Invoices: Check the "Search filters" form in the left-hand sidebar. -> View an invoice: Check the label in the form. - Acquisitions -> Vendor -> Receive shipments: Check the table of invoices. - Acquisitions -> Orders search (in the search header) -> Advanced search: Check the labels in the form. Signed-off-by: Salman Ali <salman.ali@inLibro.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Note: I fixed Salman's SO line Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2021-06-09 10:59:31 +00:00
<thead><tr><th>Invoice number</th><th>Shipment date</th><th></th></tr></thead>
Bug 10366: Alert librarian if an invoice number is duplicated Some vendors ship materials from the same invoice in multiple packages. In those cases, it would be good to notify the librarian when they enter a duplicate invoice number, so that they can continue receiving on the previously-created invoice, rather than creating an invoice with a duplicate number. To test: 1) Apply patch and run database update. 2) Make sure that you have created at least one invoice on acqui/parcels.pl and take note of the invoice number. 3) Try to create an invoice with the same invoice number. 4) Note that without changing your configuration this works exactly the same as before. 5) Turn on the AcqWarnOnDuplicateInvoice system preference. 6) Try to create a new invoice with the same number as the one you noted earlier. 7) Make sure you get a warning about a duplicate invoice. 8) Choose to receive on the existing invoice. 9) Confirm that you are receiving on said existing invoice. 10) Start the receiving process over, and this time choose "Create new invoice anyway." 11) Confirm that you are now receiving on a new invoice. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. I have followed the test plan, but also checked some more things: - Checking the duplicate check works when you have the entered invoice number in your database multiple times already. - Checking that no duplicate message is shown if you enter the invoice number and it's already been used for an invoice from another vendor. Looks all good. I think the only thing we could argue about here is if this could be activated by default for new installations. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-29 03:03:59 +00:00
<tbody>
[% FOREACH invoice IN duplicate_invoices %]
<tr>
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<td>[% invoice.invoicenumber | html %]</td>
Bug 10366: Alert librarian if an invoice number is duplicated Some vendors ship materials from the same invoice in multiple packages. In those cases, it would be good to notify the librarian when they enter a duplicate invoice number, so that they can continue receiving on the previously-created invoice, rather than creating an invoice with a duplicate number. To test: 1) Apply patch and run database update. 2) Make sure that you have created at least one invoice on acqui/parcels.pl and take note of the invoice number. 3) Try to create an invoice with the same invoice number. 4) Note that without changing your configuration this works exactly the same as before. 5) Turn on the AcqWarnOnDuplicateInvoice system preference. 6) Try to create a new invoice with the same number as the one you noted earlier. 7) Make sure you get a warning about a duplicate invoice. 8) Choose to receive on the existing invoice. 9) Confirm that you are receiving on said existing invoice. 10) Start the receiving process over, and this time choose "Create new invoice anyway." 11) Confirm that you are now receiving on a new invoice. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. I have followed the test plan, but also checked some more things: - Checking the duplicate check works when you have the entered invoice number in your database multiple times already. - Checking that no duplicate message is shown if you enter the invoice number and it's already been used for an invoice from another vendor. Looks all good. I think the only thing we could argue about here is if this could be activated by default for new installations. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-29 03:03:59 +00:00
<td>[% invoice.shipmentdate | $KohaDates %]</td>
Bug 21526: uri escape TT variables when used in 'a href' This patch has been generated with the script provided on bug 21576. It only affects variable used in the href attribute of a link *when* href it the first attribute of the node (grep "a href") Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-10-15 22:44:51 +00:00
<td><a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoice.invoiceid | uri %]">Receive</a></td>
Bug 10366: Alert librarian if an invoice number is duplicated Some vendors ship materials from the same invoice in multiple packages. In those cases, it would be good to notify the librarian when they enter a duplicate invoice number, so that they can continue receiving on the previously-created invoice, rather than creating an invoice with a duplicate number. To test: 1) Apply patch and run database update. 2) Make sure that you have created at least one invoice on acqui/parcels.pl and take note of the invoice number. 3) Try to create an invoice with the same invoice number. 4) Note that without changing your configuration this works exactly the same as before. 5) Turn on the AcqWarnOnDuplicateInvoice system preference. 6) Try to create a new invoice with the same number as the one you noted earlier. 7) Make sure you get a warning about a duplicate invoice. 8) Choose to receive on the existing invoice. 9) Confirm that you are receiving on said existing invoice. 10) Start the receiving process over, and this time choose "Create new invoice anyway." 11) Confirm that you are now receiving on a new invoice. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. I have followed the test plan, but also checked some more things: - Checking the duplicate check works when you have the entered invoice number in your database multiple times already. - Checking that no duplicate message is shown if you enter the invoice number and it's already been used for an invoice from another vendor. Looks all good. I think the only thing we could argue about here is if this could be activated by default for new installations. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-29 03:03:59 +00:00
</tr>
[% END %]
</tbody>
</table>
Bug 34478: Manual fix - parcels.pl (cud-confirm cud-new) Bug 34478: [TO SQUASH] Manual fix - parcels.pl (cud-confirm cud-new) Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2024-01-19 17:00:44 +00:00
<form method="post" action="parcels.pl">
[% INCLUDE 'csrf-token.inc' %]
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
Bug 34478: Manual fix - parcels.pl (cud-confirm cud-new) Bug 34478: [TO SQUASH] Manual fix - parcels.pl (cud-confirm cud-new) Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2024-01-19 17:00:44 +00:00
<input type="hidden" name="op" value="cud-confirm" />
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<input type="hidden" name="invoice" value="[% invoicenumber | html %]" />
Bug 30718: (QA follow-up) KohaDates filter on inputs Found another one on a visible input. Replaced with html filter. koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt: <input type="text" class="enrolmentperioddate" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" /> But we also have a few hidden ones. First verified that cleanborrowers did not work anymore with expirydate. Fixed it with passing iso dateformat to resolve. intranet-tmpl/prog/en/modules/acqui/parcels.tt: <input type="hidden" name="shipmentdate" value="[% shipmentdate | $KohaDates %]" /> intranet-tmpl/prog/en/modules/serials/subscription-add.tt: <input type="hidden" id="acqui_date" name="firstacquidate" value="[% firstacquidate | $KohaDates %]"/> intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt: <input type="hidden" name="new_hard_due_date" value="[% new_hard_due_date | $KohaDates %]" /> intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt: <input type="hidden" name="not_borrowed_since" value="[% not_borrowed_since | $KohaDates %]" /> intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt: <input type="hidden" name="last_issue_date" value="[% last_issue_date | $KohaDates %]" /> intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt: <input type="hidden" name="borrower_dateexpiry" value="[% borrower_dateexpiry | $KohaDates %]" /> intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt: <input type="hidden" name="borrower_lastseen" value="[% borrower_lastseen | $KohaDates %]" /> Test plan: Try cleanborrowers with expiry date. cd koha-tmpl; git grep "<input.*\$KohaDates" | grep -v iso Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-08-19 09:04:49 +00:00
<input type="hidden" name="shipmentdate" value="[% shipmentdate | $KohaDates dateformat => 'iso' %]" />
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<input type="hidden" name="shipmentcost" value="[% shipmentcost | html %]" />
<input type="hidden" name="shipmentcost_budgetid" value="[% shipmentcost_budgetid | html %]" />
Bug 32070: Consistent classes for primary buttons: Acquisitions This patch makes changes the button markup in Acquisitions templates so that all submit buttons and any buttons that should should be styled as primary buttons have the Bootstrap class "btn btn-primary." To test, apply the patch and view pages in Acquisitions to confirm that everything looks correct. In most cases there are no visible changes. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-11-02 11:43:32 +00:00
<input type="submit" class="btn btn-primary" value="Create new invoice anyway" />
Bug 10366: Alert librarian if an invoice number is duplicated Some vendors ship materials from the same invoice in multiple packages. In those cases, it would be good to notify the librarian when they enter a duplicate invoice number, so that they can continue receiving on the previously-created invoice, rather than creating an invoice with a duplicate number. To test: 1) Apply patch and run database update. 2) Make sure that you have created at least one invoice on acqui/parcels.pl and take note of the invoice number. 3) Try to create an invoice with the same invoice number. 4) Note that without changing your configuration this works exactly the same as before. 5) Turn on the AcqWarnOnDuplicateInvoice system preference. 6) Try to create a new invoice with the same number as the one you noted earlier. 7) Make sure you get a warning about a duplicate invoice. 8) Choose to receive on the existing invoice. 9) Confirm that you are receiving on said existing invoice. 10) Start the receiving process over, and this time choose "Create new invoice anyway." 11) Confirm that you are now receiving on a new invoice. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. I have followed the test plan, but also checked some more things: - Checking the duplicate check works when you have the entered invoice number in your database multiple times already. - Checking that no duplicate message is shown if you enter the invoice number and it's already been used for an invoice from another vendor. Looks all good. I think the only thing we could argue about here is if this could be activated by default for new installations. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-29 03:03:59 +00:00
</form>
</div>
[% END %]
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% IF ( count ) %]
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<p> [% count | html %] shipments</p>
Bug 31828: Add page-section to list of open invoices on receive shipment page (acq) This patch adds a "page-section" class to the div wrapping the table of shipments on the "Receive shipment" page in Acquisitions. This patch also modifies the markup around additional fields so that an empty fieldset is not displayed when there are no additional fields to display. To test, apply the patch and go to Acquisitions. - Locate a vendor and view its details. - In the toolbar, click "Receive shipments." - On the receive page, there should be a section listing shipments and a section headed "Receive a new shipment." - If you have additional fields defined (in Administration -> Additional fields -> Invoices) there should be a third section showing those fields. - With no additional fields defined you should not see an empty fieldset. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-11-09 16:24:06 +00:00
<div id="resultlist" class="page-section">
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
<!-- Search Results Table -->
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
<table class="small" id="parcelst">
<thead>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
<tr>
<th>Line</th>
Bug 27983: Replace obsolete title-string sorting: Acquisitions templates part 2 This patch modifies several acquisitions templates to replace the use of the "title-string" DataTables sorting method with the newer "data-order" attribute. To test, apply the patch and view the following pages to confirm that columns containing dates sort correctly when using any setting of the "dateformat" system preference: - Acquisitions -> Late orders - Acquisitions -> Vendor -> Basket -> Add to basket -> From a subscription - Acquisitions -> "All available funds" table -> Click an "Ordered" value -> Click a "Spent" value - Acquisitions -> Vendor -> Receive shipments - Acquisitions -> Vendor -> test sorting of contracts in the "Contracts" table Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2021-03-18 15:38:14 +00:00
<th>Date received</th>
Bug 2780 - Capitalize strings consistently (Acquisitions pages) Correcting capitalization on strings in Acquisitions templates Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-04-03 18:22:42 +00:00
<th>Invoice number</th>
<th>Item count</th>
Bug 34434: Terminology: Biblio should be bibliographic This patch corrects several more instances where the templates use the term "biblio" where it should use "bibliographic." To test, apply the patch and confirm that these instances read correctly: - About -> Special thanks... -> Mines Paristech: "bibliographic frameworks" - Acquisitions -> Vendor -> Receive shipments: "Record count" in the table of shipments. - Catalogue -> Bibliographic record details -> Labeled MARC: "Labeled MARC record" heading. - Circulation -> Holds to pull: Error message, "hold has been placed at the bibliographic record level." * I'm not sure how one can trigger this error message. - Tools -> Log viewer -> Filter by "Catalog" and "Add": "Bibliographic record..." link in the "Object" column. Signed-off-by: Sam Lau <samalau@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-07-27 15:12:12 +00:00
<th>[% tp("Bibliographic record", "Record count") | html %]</th>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
<th>Items expected</th>
</tr>
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
</thead>
<tbody>
<!-- Actual Search Results -->
[% FOREACH searchresult IN searchresults %]
<tr>
<td>
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
[% searchresult.number | html %]
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
</td>
Bug 27983: Replace obsolete title-string sorting: Acquisitions templates part 2 This patch modifies several acquisitions templates to replace the use of the "title-string" DataTables sorting method with the newer "data-order" attribute. To test, apply the patch and view the following pages to confirm that columns containing dates sort correctly when using any setting of the "dateformat" system preference: - Acquisitions -> Late orders - Acquisitions -> Vendor -> Basket -> Add to basket -> From a subscription - Acquisitions -> "All available funds" table -> Click an "Ordered" value -> Click a "Spent" value - Acquisitions -> Vendor -> Receive shipments - Acquisitions -> Vendor -> test sorting of contracts in the "Contracts" table Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2021-03-18 15:38:14 +00:00
<td data-order="[% searchresult.datereceived | html %]">
[% searchresult.datereceived | $KohaDates %]
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
</td>
<td>
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
[% IF ( searchresult.code ) %]
Bug 21526: uri escape TT variables when used in 'a href' This patch has been generated with the script provided on bug 21576. It only affects variable used in the href attribute of a link *when* href it the first attribute of the node (grep "a href") Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-10-15 22:44:51 +00:00
<a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid | uri %]">[% searchresult.code | html %]</a>
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
[% ELSE %]
Bug 12291:_(followup) Replace the acronym HTML tag with abbr This patch replaces the last occurrence of <acronym> with <abbr>. To test: - Apply this patch on top of the first patch and check that "grep -r "<acronym" koha-tmpl/*/*/en/*" does not return any hits. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-05 12:27:08 +00:00
<abbr title="not available">n/a</abbr>
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
[% END %]
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
</td>
<td>
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
[% searchresult.reccount | html %]
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
</td>
<td>
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
[% searchresult.bibcount | html %]
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
</td>
<td>
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
[% searchresult.itemcount | html %]
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
</td>
</tr>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% END %]
Bug 5345: DataTables integration in acquisition module [12] parcels.tt http://bugs.koha-community.org/show_bug.cgi?id=8103 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works. Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 14:58:54 +00:00
</tbody>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
</table>
<div id="resultnumber">
<!-- Row of numbers corresponding to search result pages -->
[% IF ( displayprev ) %]
Bug 21526: uri escape TT variables when used in 'a href' This patch has been generated with the script provided on bug 21576. It only affects variable used in the href attribute of a link *when* href it the first attribute of the node (grep "a href") Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-10-15 22:44:51 +00:00
<a href="parcels.pl?booksellerid=[% booksellerid | uri %]&amp;startfrom=[% prevstartfrom | uri %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom | uri %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto | uri %][% END %][% IF ( code ) %]&amp;filter=[% code | uri %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby | uri %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage | uri %][% END %]&amp;type=intra">&lt;&lt; Previous</a>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% END %]
[% FOREACH number IN numbers %]
[% IF ( number.highlight ) %]
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<span class="current">[% number.number | html %]</span>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% ELSE %]
Bug 21526: uri escape TT variables when used in 'a href' This patch has been generated with the script provided on bug 21576. It only affects variable used in the href attribute of a link *when* href it the first attribute of the node (grep "a href") Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-10-15 22:44:51 +00:00
<a href="parcels.pl?booksellerid=[% booksellerid | uri %]&amp;startfrom=[% number.startfrom | uri %][% IF ( number.datefrom ) %]&amp;datefrom=[% number.datefrom | uri %][% END %][% IF ( number.dateto ) %]&amp;dateto=[% number.dateto | uri %][% END %][% IF ( number.code ) %]&amp;filter=[% number.code | uri %][% END %][% IF ( number.orderby ) %]&amp;orderby=[% number.orderby | uri %][% END %][% IF ( number.resultsperpage ) %]&amp;resultsperpage=[% number.resultsperpage | uri %][% END %]&amp;type=intra">[% number.number | html %]</a>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% END %]
[% END %]
[% IF ( displaynext ) %]
Bug 21526: uri escape TT variables when used in 'a href' This patch has been generated with the script provided on bug 21576. It only affects variable used in the href attribute of a link *when* href it the first attribute of the node (grep "a href") Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-10-15 22:44:51 +00:00
<a href="parcels.pl?booksellerid=[% booksellerid | uri %]&amp;startfrom=[% nextstartfrom | uri %][% IF ( datefrom ) %]&amp;datefrom=[% datefrom | uri %][% END %][% IF ( dateto ) %]&amp;dateto=[% dateto | uri %][% END %][% IF ( code ) %]&amp;filter=[% code | uri %][% END %][% IF ( orderby ) %]&amp;orderby=[% orderby | uri %][% END %][% IF ( resultsperpage ) %]&amp;resultsperpage=[% resultsperpage | uri %][% END %]&amp;type=intra">Next &gt;&gt;</a>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% END %]
</div>
</div>
[% END %]
<div id="parcels_new_parcel">
Bug 34478: Manual fix - parcels.pl (cud-confirm cud-new) Bug 34478: [TO SQUASH] Manual fix - parcels.pl (cud-confirm cud-new) Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2024-01-19 17:00:44 +00:00
<form method="post" action="parcels.pl" class="validated">
[% INCLUDE 'csrf-token.inc' %]
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
<fieldset class="rows">
<legend>Receive a new shipment</legend>
<ol> <li>
Bug 16351: Making invoice number a required field EDIT: Added 'validated' class to form and removed 'Required' span (became unnecessary) To test: 1) Go to Acqui -> Do a vendor search 2) Receive a shipment 3) Attempt to click 'Next' without specifying invoice number. Notice error. 4) Go back to vendor search then apply patch. Click Receive shipment 5) Notice you cannot click 'Next' until you put something in invoice number. Sponsored-by: Catalyst IT Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2016-04-26 01:27:19 +00:00
<label for="invoice" class="required">Vendor invoice:</label>
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
Bug 34478: Manual fix - parcels.pl (cud-confirm cud-new) Bug 34478: [TO SQUASH] Manual fix - parcels.pl (cud-confirm cud-new) Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2024-01-19 17:00:44 +00:00
<input type="hidden" name="op" value="cud-new" />
Bug 16351: Making invoice number a required field EDIT: Added 'validated' class to form and removed 'Required' span (became unnecessary) To test: 1) Go to Acqui -> Do a vendor search 2) Receive a shipment 3) Attempt to click 'Next' without specifying invoice number. Notice error. 4) Go back to vendor search then apply patch. Click Receive shipment 5) Notice you cannot click 'Next' until you put something in invoice number. Sponsored-by: Catalyst IT Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2016-04-26 01:27:19 +00:00
<input type="text" size="20" id="invoice" name="invoice" class="focus required" required="required" />
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
</li>
[% IF ( gst ) %]
<li>
<label for="gst">GST:</label>
<input type="text" size="20" id="gst" name="gst" />
</li>
[% END %]
<!-- // Removing freight input until shipping can be proplerly handled .
<li>
<label for="freight">Shipping:</label>
<input type="text" size="20" id="freight" name="freight" />
</li> -->
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
<li>
<label for="shipmentdate">Shipment date: </label>
Bug 30718: Use flatpickr's altInput The idea rely on the KohaDates TT plugin for the date formatting. We should not have any output_pref calls in pl or pm (there are some exceptions, for ILSDI for instance). Also flatpickr will deal with the places where dates are inputed. We will pass the raw SQL value (what we call 'iso' in Koha::DateUtils), and the controller will receive the same value, no need to additional conversion. Note that DBIC has the capability to auto-deflate DateTime objects, which makes things way easier. We can either pass the value we receive from the controller, or pass a DT object to our methods. Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-07-11 14:14:38 +00:00
<input type="text" id="shipmentdate" name="shipmentdate" maxlength="10" size="10" value="[% shipmentdate_today | html %]" class="flatpickr" />
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
</li>
<li>
Bug 10705: change 'shipment cost' to 'shipping cost' Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Trivial string change. No koha-qa errors Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> String change - fixing another occurence in a follow up. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-09-30 02:12:17 +00:00
<label for="shipmentcost">Shipping cost: </label>
Bug 34169: Add decimal class to all relevant input fields in the acquisitions module This is a first step towards more consistency and possibly supporting multiple input formats as well in the future. It marks all input fields for monetary values, such as prices, replacement prices etc. with a class that is linked to a check for number format with the jQuery Validator plugin. To test: For any input field to test, try adding various false entries, like "abc" or "1,00". It should only accept inputs with decimal dot, like: "1.00" 0) Apply patch, restart_all 1) Suggestion * Add a new suggestion in the staff interface * Test: price input field at the bottom of the form. * Accept the suggestion 2) Order form * Create a new basket * Create an order line from an existing record * Test: list price, replacement price, and actual price. * Check the checkbox for uncertain price before you save 3) Uncertain prices * Go to the uncertain prices page for this vendor * Test: price field Note: this form does its own validation, but the change should not change behaviour for now * Resolve the uncertain price * Close order 4) Receive shipment * Test: Shipping cost 5) Receive the order * Test: replacement price, actual price * Check checkbox for price in foreign currency * Test: price in foreign currency * Receive order line 6) Invoice summary * Finish receiving * Test: shipping cost * Test: invoice adjustments: amount in the form for the first entry, amount in the table after adding it 7) Merging invoices * Receive another shipment and create and invoice * Go to invoices and search all * Check the 2 entries for merging * Test: shipping cost 8) Adding orders from a staged/new file * Export some records using the cart or list * Create a new basket * Order from new file * Import your file, ignore item records * Test: price and replacement price + Bonus: also test with items, test plan and file from bug 22802 are really helpful here Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2023-07-17 16:01:25 +00:00
<input class="decimal" type="text" id="shipmentcost" name="shipmentcost" size="10" />
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
</li>
<li>
Bug 14853: Change 'Fund' to 'Shipping fund' Changes the 'Fund' to 'Shipping fund' so it's clear what the fund setting is used for. To test: - Receive a new shipment - Verify that 'Shipping fund' displays on the parcels page - Search for your invoice - View invoice details - Verify that 'Shipping fund' displays on the invoice page Followed test plan (changed lines: '...cost' -> '...fund') Display OK on both places. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-11-22 01:52:02 +00:00
<label for="shipmentcost_budgetid">Shipping fund: </label>
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
<select id="shipmentcost_budgetid" name="shipmentcost_budgetid">
Bug 10046: Standardize terms used in invoices Changes are: budget > where actually fund is meant branch > library bookseller, supplier > vendor To test: 1) Receive a shipment, check the little form where you enter your invoice number for correct use of terms. 2) Receive some orders and save finish receiving. 3) Search for your created invoice. Check filters and results table for correct use of terms. 4) Look at the details of your invoice, repeat check there. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-14 15:29:20 +00:00
<option value="">No fund</option>
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
[% FOREACH budget IN budgets %]
Bug 8821: make receive shipment page hide inactive funds like new order form This patch adapts the fund-handling code from neworderempty.pl in order to limit the display of funds by default to active ones, with the option to check a box to display all funds. This patch also adds "(inactive)" to the display of funds on this and the neworderempty.tt template because it seemed like that was useful information. To test, make sure you have both active and inactive funds. Start the process of receiving a shipment. The "fund" option in the receive shipment form should show only active funds. Checking the "show all" checkbox should allow you to choose from both active and inactive funds. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-07-19 13:07:52 +00:00
[% IF ( budget.b_active ) %]
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<option value="[% budget.b_id | html %]">[% budget.b_txt | html %]</option>
Bug 8821: make receive shipment page hide inactive funds like new order form This patch adapts the fund-handling code from neworderempty.pl in order to limit the display of funds by default to active ones, with the option to check a box to display all funds. This patch also adds "(inactive)" to the display of funds on this and the neworderempty.tt template because it seemed like that was useful information. To test, make sure you have both active and inactive funds. Start the process of receiving a shipment. The "fund" option in the receive shipment form should show only active funds. Checking the "show all" checkbox should allow you to choose from both active and inactive funds. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-07-19 13:07:52 +00:00
[% ELSE %]
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<option value="[% budget.b_id | html %]" class="b_inactive">[% budget.b_txt | html %] (inactive)</option>
Bug 8821: make receive shipment page hide inactive funds like new order form This patch adapts the fund-handling code from neworderempty.pl in order to limit the display of funds by default to active ones, with the option to check a box to display all funds. This patch also adds "(inactive)" to the display of funds on this and the neworderempty.tt template because it seemed like that was useful information. To test, make sure you have both active and inactive funds. Start the process of receiving a shipment. The "fund" option in the receive shipment form should show only active funds. Checking the "show all" checkbox should allow you to choose from both active and inactive funds. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-07-19 13:07:52 +00:00
[% END %]
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
[% END %]
</select>
Bug 14163: Acq - receive shipment and order from staged: rename 'Show all' to 'Show inactive' 'Show all' in acquisition makes the inactive funds in the fund list box visible. This patch changes the text to 'Show inactive' to be more clear about the functionality. Patch changes 2 pages. To test: 1) Order from staged file - make sure you have uploaded a few records via the tools - create a new order using the 'From a staged file' option - select a file to order from - 'Add orders' - Verify the 'Select to import' tab now displayed the text 'Show inactive funds' and that it works as expected - Switch to the 'Default accounting details' tab - Verify the text there is also changed to 'Show inactive' and works like expected. 2) Receive shipment - receive a new shipment for a vendor with unreceived orders - Verify the label next to the fund list has changed to 'Show inactive' and works as expected. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Simple string change, no errors. Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2015-05-31 13:52:26 +00:00
<label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
Bug 8821: make receive shipment page hide inactive funds like new order form This patch adapts the fund-handling code from neworderempty.pl in order to limit the display of funds by default to active ones, with the option to check a box to display all funds. This patch also adds "(inactive)" to the display of funds on this and the neworderempty.tt template because it seemed like that was useful information. To test, make sure you have both active and inactive funds. Start the process of receiving a shipment. The "fund" option in the receive shipment form should show only active funds. Checking the "show all" checkbox should allow you to choose from both active and inactive funds. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-07-19 13:07:52 +00:00
<input type="checkbox" id="showallfunds" />
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
</li>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
</ol>
</fieldset>
Bug 31828: Add page-section to list of open invoices on receive shipment page (acq) This patch adds a "page-section" class to the div wrapping the table of shipments on the "Receive shipment" page in Acquisitions. This patch also modifies the markup around additional fields so that an empty fieldset is not displayed when there are no additional fields to display. To test, apply the patch and go to Acquisitions. - Locate a vendor and view its details. - In the toolbar, click "Receive shipments." - On the receive page, there should be a section listing shipments and a section headed "Receive a new shipment." - If you have additional fields defined (in Administration -> Additional fields -> Invoices) there should be a third section showing those fields. - With no additional fields defined you should not see an empty fieldset. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-11-09 16:24:06 +00:00
[% IF available_additional_fields %]
[% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
[% END %]
Bug 32070: Consistent classes for primary buttons: Acquisitions This patch makes changes the button markup in Acquisitions templates so that all submit buttons and any buttons that should should be styled as primary buttons have the Bootstrap class "btn btn-primary." To test, apply the patch and view pages in Acquisitions to confirm that everything looks correct. In most cases there are no visible changes. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-11-02 11:43:32 +00:00
<fieldset class="action"><input type="submit" class="btn btn-default" value="Next" /> <a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">Cancel</a></fieldset>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
</form>
</div>
Bug 20690: Update two-column templates with Bootstrap grid: Acquisitions part 4 This patch modifies several acquisitions templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags and "text/css" attributes from <style> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Acquisitions home page -> Click a "spent" value for a fund. - Acquisitions -> Vendor -> Vendor details. - Acquisitions -> Vendor -> Uncertain prices - Acquisitions -> Vendor -> Receive shipments - Click an "Invoice number" link in the table of shipments. - Click "Receive" for one of the titles in pending orders. Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-05-01 15:49:26 +00:00
</main>
</div> <!-- /.col-sm-10.col-sm-push-2 -->
[% IF ( count ) %]
<div class="col-sm-2 col-sm-pull-10">
<aside>
<form method="get" action="parcels.pl">
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
<fieldset class="brief">
<h4>Filter</h4>
<ol>
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
<li> <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /></li>
<li><label for="filter">Invoice number:</label><input type="text" size="20" name="filter" value="[% filter | html %]" id="filter" /></li>
Bug 28942: Use Flatpickr on acquisitions pages This patch modifies several acquisitions pages replacing jQuery datepickers with Flatpickr widgets. To test, apply the patch and test datepickers on the following Acquisitions pages: - Acquisitions -> Late orders (linked date fields in the sidebar) - Acquisitions -> Invoices (linked date fields in the sidebar) - Acquisitions -> Invoices -> Invoice details (shipment date and billing date) - Acquisitions -> Vendor -> Receive shipment (shipment date) - Acquisitions -> Vendor -> Receive shipment -> Receive (on order line) -> Date received field under "Accounting details - Acquisitions -> Orders search tab in the header -> Advanced search: Linked date fields in the search form." Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2021-09-02 14:36:07 +00:00
<li>
<label for="datefrom">From:</label>
<input type="text" size="9" id="datefrom" name="datefrom" value="[% datefrom | html %]" class="flatpickr" />
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
</li>
<li>
<label for="dateto">To:</label>
<input type="text" size="9" id="dateto" name="dateto" value="[% dateto | html %]" class="flatpickr" />
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
</li>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
<li><label for="orderby">Sort by :</label><select name="orderby" id="orderby">
Bug 5339: Invoices management improvement - New pages: - invoices.pl: allow to search in invoices on several criteria - invoice.pl: permit to view and modify invoice details - shipment date - billing date - shipment cost and budget used for shipment cost Invoice informations are now stored in their own sql table and aqorders have a link to it Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-01-06 15:51:57 +00:00
<option value="invoicenumber">Invoice number</option>
<option value="shipmentdate">Shipment date</option>
<option value="shipmentdate desc">Shipment date reverse</option>
<option value="invoicenumber desc">Invoice number reverse</option>
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
</select><br />
<label for="resultsperpage">Results per page :</label><select name="resultsperpage" id="resultsperpage">
<option value="20">20</option>
<option value="30">30</option>
<option value="50">50</option>
<option value="100">100</option>
</select></li>
</ol>
Bug 32070: Consistent classes for primary buttons: Acquisitions This patch makes changes the button markup in Acquisitions templates so that all submit buttons and any buttons that should should be styled as primary buttons have the Bootstrap class "btn btn-primary." To test, apply the patch and view pages in Acquisitions to confirm that everything looks correct. In most cases there are no visible changes. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
2022-11-02 11:43:32 +00:00
<fieldset class="action"><input type="submit" class="btn btn-default" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset>
</fieldset>
Bug 20690: Update two-column templates with Bootstrap grid: Acquisitions part 4 This patch modifies several acquisitions templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags and "text/css" attributes from <style> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Acquisitions home page -> Click a "spent" value for a fund. - Acquisitions -> Vendor -> Vendor details. - Acquisitions -> Vendor -> Uncertain prices - Acquisitions -> Vendor -> Receive shipments - Click an "Invoice number" link in the table of shipments. - Click "Receive" for one of the titles in pending orders. Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-05-01 15:49:26 +00:00
</form>
</aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
[% END %]
</div> <!-- /.row -->
Bug 19755: Move template JavaScript to the footer: Acquisitions, part 3 This patch modifies even more staff client acquisitions templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Acquisitions -> Vendor -> Vendor details - Contracts datatable - Edit vendor - Add contacts, form validation - Acquisitions -> Vendor -> Invoices -> Invoice -> "Go to receipt" - Datatables, MARC and Card previews - Transfer - Confirmation of transfer, window closes - Acquisitions -> Vendor -> Receive shipments - Datatables, date pickers - Acquisitions -> Available funds table -> Spent report - Datatables - Acquisitions -> Vendor -> Uncertain prices - Datatables, form validation - Acquisitions -> Vendor -> Basket -> Add to basket from external source - Select and clear all on search form - Search results - Datatables, MARC and Card previews, in-table pop-up controls (click any table cell) Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2017-12-05 18:30:08 +00:00
[% MACRO jsinclude BLOCK %]
Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2015-01-23 12:18:54 +00:00
[% Asset.js("js/acquisitions-menu.js") | $raw %]
Bug 19755: Move template JavaScript to the footer: Acquisitions, part 3 This patch modifies even more staff client acquisitions templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Acquisitions -> Vendor -> Vendor details - Contracts datatable - Edit vendor - Add contacts, form validation - Acquisitions -> Vendor -> Invoices -> Invoice -> "Go to receipt" - Datatables, MARC and Card previews - Transfer - Confirmation of transfer, window closes - Acquisitions -> Vendor -> Receive shipments - Datatables, date pickers - Acquisitions -> Available funds table -> Spent report - Datatables - Acquisitions -> Vendor -> Uncertain prices - Datatables, form validation - Acquisitions -> Vendor -> Basket -> Add to basket from external source - Select and clear all on search form - Search results - Datatables, MARC and Card previews, in-table pop-up controls (click any table cell) Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2017-12-05 18:30:08 +00:00
[% INCLUDE 'calendar.inc' %]
[% INCLUDE 'datatables.inc' %]
Bug 22975: Remove type attribute from script tags: Acquisitions This patch removes the "type" attribute from <script> tags in several acquisitions templates. Also removed: Obsolete "//<![CDATA[ //]]>" markers. This patch also makes minor indentation changes, so diff using the "-w" flag. To test, apply the patch and confirm that examples of affected pages work properly without any JavaScript errors in the browser console: - Acquisitions -> Vendors -> Vendor -> Basket groups - Acquisitions -> Vendors -> Vendor -> Receive shipments - Acquisitions -> Vendors -> Vendor -> Basket: In the table of orders, click "Transfer." Transfer an order Validating the HTML source of any of these pages should return no errors related to the "type" attribute. Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2019-05-23 13:50:07 +00:00
<script>
Bug 19755: Move template JavaScript to the footer: Acquisitions, part 3 This patch modifies even more staff client acquisitions templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Acquisitions -> Vendor -> Vendor details - Contracts datatable - Edit vendor - Add contacts, form validation - Acquisitions -> Vendor -> Invoices -> Invoice -> "Go to receipt" - Datatables, MARC and Card previews - Transfer - Confirmation of transfer, window closes - Acquisitions -> Vendor -> Receive shipments - Datatables, date pickers - Acquisitions -> Available funds table -> Spent report - Datatables - Acquisitions -> Vendor -> Uncertain prices - Datatables, form validation - Acquisitions -> Vendor -> Basket -> Add to basket from external source - Select and clear all on search form - Search results - Datatables, MARC and Card previews, in-table pop-up controls (click any table cell) Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2017-12-05 18:30:08 +00:00
$(document).ready(function() {
var parcelst = $("#parcelst").dataTable($.extend(true, {}, dataTablesDefaults, {
Bug 34913: DataTables upgrade: Update CSS and option names This patch makes two categories of changes: 1. CSS changes to accommodate changes in DataTables default CSS and markup structure. I've tried to make sure all of our Koha-specific styles are still applying. This change necessitates a rebuild of staff interface CSS. 2. DataTables option names: In this version of DataTables you can't override a default which uses CamelCase (e.g. "pagingType") with one in "Hungarian" notation, e.g. "sPaginationType." Since we define many default options in prog/js/datatables.js in camel case, any template which previously used a Hungarian notation option to override the default has now been updated to use the CamelCase version. See https://datatables.net/upgrade/1.10-convert#Options for a summary of the different option name changes. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
2023-09-28 17:43:32 +00:00
"paginate": false
Bug 19755: Move template JavaScript to the footer: Acquisitions, part 3 This patch modifies even more staff client acquisitions templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of the modified templates: All button controls, DataTables functionality, tabs, etc. - Acquisitions -> Vendor -> Vendor details - Contracts datatable - Edit vendor - Add contacts, form validation - Acquisitions -> Vendor -> Invoices -> Invoice -> "Go to receipt" - Datatables, MARC and Card previews - Transfer - Confirmation of transfer, window closes - Acquisitions -> Vendor -> Receive shipments - Datatables, date pickers - Acquisitions -> Available funds table -> Spent report - Datatables - Acquisitions -> Vendor -> Uncertain prices - Datatables, form validation - Acquisitions -> Vendor -> Basket -> Add to basket from external source - Select and clear all on search form - Search results - Datatables, MARC and Card previews, in-table pop-up controls (click any table cell) Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2017-12-05 18:30:08 +00:00
}));
//keep a copy of all budgets before removing the inactives
var budgetId = $("#shipmentcost_budgetid");
var disabledBudgetsCopy = budgetId.html();
$('.b_inactive').remove();
$('#showallfunds').click(function() {
if ($(this).is(":checked")) {
budgetId.html(disabledBudgetsCopy); //Puts back all the funds
}
else {
$('.b_inactive').remove();
}
});
});
</script>
[% END %]
Bug 5917 : Converted templates
2011-03-21 07:02:15 +00:00
[% INCLUDE 'intranet-bottom.inc' %]
Copy permalink