Commit graph

375 commits

Author SHA1 Message Date
Chris Cormack
12741cfafa Bug 5399: Follow up style patch, moving exits out of subroutine 2011-01-17 22:53:28 +13:00
4532ca70bc Bug 5399: remove useless eval 'use C4::Foo'
Also add a couple FIXMEs

Marcel: Signed and updated for current master

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-17 22:52:53 +13:00
Robin Sheat
8e5ee007db Bug 5186 - allow tax rates to be set to zero (master)
This allows the tax rate for a vendor to be set to zero. Previously, a
zero meant that the system default was used. Now, zero means no tax, and
to have it be the default the field should simply be left empty.
Additionally:
* this will now show on the vendor display if the tax value is from the
  system default
* this includes a database update that changes all the existing 0.00 tax
  settings to be NULL, which preserves existing behaviour.
* this now saves the tax value supplied for new vendors

Note: this patch applies against master

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 14:34:05 +13:00
Katrin Fischer
eb2c10eff9 Bug 5104: Add control number as search option to acq z39.50 search
Adds control number as search option to z39.50 search in acquisitions.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:32:32 +13:00
d9de6ebab3 Fix for Bug 4498 - Acq always shows '1 suggestions waiting'
- Removing 'suggestions waiting' link from left-hand menu. A plain
  'suggestions' link is still shown if suggestions are enabled.
- Putting back the 'pending suggestions' box that used to appear
  on the Acquisitions home page. This will show, with a count
  of pending suggestions, only if suggestions are turned on and
  there are pending suggestions.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-14 09:34:45 +13:00
Andrew Elwell
9fa574f609 Bug 5385: POD Cleanups (part 1)
working through the master branch to eliminate all
podchecker warnings/errors

Actual improvement to the quality of the POD will
come later (hopefully with assistance of others)

Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-12 10:06:55 +13:00
f987d35a22 Fix for Bug 5254 - no need to scroll left to right on acq z search
- Adding inline preview/import menu to match cataloging z39.50 search
- Improving behavior of inline menu on both pages
- Adding white space to ISBN/ISSN output on both pages to allow
  line breaks, improving table width and horizontal scrolling.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 08:48:15 -04:00
Katrin Fischer
d7b6d43a2e Bug 5092: No results when searching by LC Call Number: in Z39.50 Server
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 08:32:47 -04:00
Katrin Fischer
53a11dbea9 Bug 5090: New order from empty record does not save publication year and ISBN
- make publication year save for MARC21
- make ISBN save
- fix small template issue with label for vendor note

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:49:48 -04:00
f2573b6d0f Revert "Bug 5081 - let the ISBN be saved on new manual orders"
Reverting in favor of a more comprehensive patch.

This reverts commit 4bd7492518.
2010-10-06 06:49:13 -04:00
Robin Sheat
4bd7492518 Bug 5081 - let the ISBN be saved on new manual orders
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:18:53 -04:00
Chris Cormack
fe8e5fdf39 Fix typo in z3950 search in acquisitions
Signed-off-by: Chris Cormack <chrisc@catalyst.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-20 16:10:18 -04:00
Chris Cormack
cb06075e77 wr72054 fixing the z3950 search for acquisitions
Signed-off-by: Chris Cormack <chrisc@catalyst.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-15 21:51:19 -04:00
Chris Cormack
d082b28ba7 Bug 2505: Quieting warns in acqui/z3950_search.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-15 21:51:16 -04:00
Henri-Damien LAURENT
eb53c0d662 newordersuggestion would not filter by status
All the suggestions would be displayed without any consideration of their status.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-07 12:42:01 -04:00
2e6f91dc71 Bug 4188 Valid PDF file name when printing basket group with no name
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-06 08:20:31 -04:00
573ac9488f remove a bunch of unconditional debug warns
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 10:57:08 -04:00
1457256b98 bug 4188: move PDF templates for printed purchase orders
The PDF templates for purchase orders now live in the
directory koha-tmpl/intranet-tmpl/prog/pdf to separate
them from code.  As no automatic translation system for
PDF files is currently implemented, I'm keeping them out
of the language subdirectories for now.

At present, there are two choices of templates for printing
purchase orders (AKA basket groups), controlled by setting
the OrderPdfFormat syspref:

pdfformat::layout2pages (two-page layout)
pdfformat::layout3pages (three-page layout)

To customize a template or to add a new one requires two steps:

* modifying the PDF; note that OpenOffice source files
  are included as a way of generating the PDF
* modifying the code in acqui/pdfformat/layout*.pm to
  position the order text onto the template

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 08:49:44 -04:00
b1c1f6f434 remove extraneous warns
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 08:49:42 -04:00
0eea24a8a1 Bug 4188 Allow acq basket group printing into PDF
Since new acquisition module workflow and specifications is not
documented, this fix is more an hypothesis than a patch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 08:49:42 -04:00
Henri-Damien LAURENT
7e8f7eb258 MT3652 : Unifying the search of neworder with Search
This patch unifies the search in neworder so that the same biblios should be sent back when searching from catalogue search or from box.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 20:42:40 -04:00
Alex Arnaud
e44fc909ef (BUG #4356) Basket.pl: adding a link to the basketgroup
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 14:27:44 -04:00
Colin Campbell
d7a6f17f11 Fix depreciation warnings in acqui/z3950_search.pl
Perl generates depreciation warnings on compilation
caused by use of ambiguous syntax. Seemed that an
underlying confusion as to row's type

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-17 19:32:33 -04:00
Colin Campbell
d6649d8831 Remove obsolete variables from basket.pl
basket.pl calculates variables i, odd and count which are
no longer used in the template
removing them allows some simplification of the main loop
and cuts out on an extra db call
Loop through basketgroups also made more readable
Try to dimish the number of undef warnings filling the logs

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 10:23:16 -04:00
Colin Campbell
5be6dc422b Remove generation of an unnecessary warning
We've checked the return for definedness and
assigned an empty string to it ao we don't want
to make it undef again

This is a good argument that cascading if-elses expecially with
long unstructured elses are a bad idea

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 10:22:29 -04:00
Colin Campbell
47a29c2bef Bug 4510 Script processes single supplier not an array
Script was written as though it had an array rather than
a single supplier. Replaced the excess punctuation with a single
supplier variable

replaced the C-style currency loop with a simpler perl-style one
we only need 1 loop not multiples
Changed variable name $GST to $tax_rate it's not magical and not a constant
and we all know what tax is
Fetch Contract data once rather than twice from two different modules
Correct size of discount data on display

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 09:37:42 -04:00
Alex Arnaud
4907f5806c (BUG #4357) Closing a basket and creating baskets group
when closing a basket without creating a basketgroup, the group is still created => corrected
+ replace "create a basketgroup?" by "create a purchase order now?" in confirmation step.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:55 -04:00
Alex Arnaud
e42e92b42e (BUG #4355) Basket.pl: withdrawal of the "can not close the basket" button
Basket.pl: withdrawal of the "can not close the basket"button. only Uncerain
prices button is displayed. And removing the "??" in the price columns,
replaced by "uncertain" in rrp column

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:13 -04:00
Alex Arnaud
c496327edc (BUG #4348) parcel.pl: list with duplicates orders after a clearfilter
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:05 -04:00
Alex Arnaud
08f4a2706a (BUG #4345) Redirect after closing a basket and creation of a group
after closing a basket and creation of a group we should landed on the "Closed" tab.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:04 -04:00
Alex Arnaud
129e4c045f (BUG #4342) should not be able to close an empty basket
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:22:44 -04:00
c9ba8c899d Merge branch 'bug2505_patches' of git://git.catalyst.net.nz/koha into to-push
* 'bug2505_patches' of git://git.catalyst.net.nz/koha: (24 commits)
  Bug 2505 - use strict and warnings in sax_parser_test
  Bug 2505 - enable warnings for link_bibs_to_authorities
  Bug 2505 - add strict and warnings to perlmodule_ls
  Bug 2505 - add strict and warnings to check_sysprefs
  Bug 2505 - Add commented use warnings where missing in *.t
  Bug 2505 - Add commented use warnings where missing in *.pm
  Bug 2505 - Add commented use warnings where missing in the cataloguing/ directory
  Bug 2505 - Add commented use warnings where missing in the misc/ directory
  Bug 2505 - Add commented use warnings where missing in the tools/ directory
  Bug 2505 - Add commented use warnings where missing in the installer/ directory
  Bug 2505 - Add commented use warnings where missing in the rotating_collections/ directory
  Bug 2505 - Add commented use warnings where missing in the C4/ directory
  Bug 2505 - Add commented use warnings where missing in the serials/ directory
  Bug 2505 - Add commented use warnings where missing in the catalogue/ directory
  Bug 2505 - Add commented use warnings where missing in the sms/ directory
  Bug 2505 - Add commented use warnings where missing in the opac/ directory
  Bug 2505 - Add commented use warnings where missing in the virtualshelves/ directory
  Bug 2505 - Add commented use warnings where missing in the suggestion/ directory
  Bug 2505 - Add commented use warnings where missing in the admin/ directory
  Bug 2505 - Add commented use warnings where missing in the circ/ directory
  ...

Conflicts:
	C4/Auth_with_cas.pm
	acqui/supplier.pl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 07:13:37 -04:00
Paul Poulain
b78e704c6a removing warn logs
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 07:09:27 -04:00
Paul Poulain
7a5174049d budget limit not working
on a new order, the branch limits for the budgets where not managed properly
if a budget had a limit on branch, it was not respected : the list displayed all budgets, including other branches than mine

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 06:56:39 -04:00
1675c8fb01 Fix a warning in log
Using a hash as a reference is deprecated

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-22 06:38:45 -04:00
Robin Sheat
32f058aaee wr69607 - fixed conditions for display of tax details
Previously, if the tax rate for a particular seller was '0.000' it
couldn't be edited. Now, the tax information always is shown if there
is a default system one, or one for that seller.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-22 06:38:03 -04:00
Chris Cormack
629d65c114 wr69959 Pagination on neworderbiblio was missing baskteno, caused a server error when trying to add an order on any page other than page one
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-22 06:28:52 -04:00
Donovan Jones
b865ff624c Bug 2505 - Add commented use warnings where missing in the acqui/ directory 2010-04-21 20:19:35 +12:00
Chris Cormack
d4c8f960dd Fix for acquisitions - Series title was not saving when adding new record
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:26:11 -04:00
Colin Campbell
3d86d6af53 Refactor for Human Readability
Fixes  generation of empty index page when total_parcels is a multiple of pagesize
Remove some calculations whose results were not used
Make variable names meaningful (results and count arnt)
Fix errors in pod syntax
Make what code does clearer to readers who are not computers
Use a subroutine

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:20:23 -04:00
Colin Campbell
70af459372 Bug 4331 Remove cruft from acqui-home script
Remove unnecessary db calls and processing from acqui-home.pl
Do not duplicate processing of fields
Declare variables closer to use
Remove unnecessary holding vars
Replace some anonymous var names by something more meaningful
Do not generate a toggle variable use Template's LOOP vars

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-07 11:15:07 -04:00
Lars Wirzenius
5f69c342de Fix FSF address in directory acqui/
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:51 -04:00
Paul Poulain
452c0ab719 MT2716: fixing finishreceive.pl Software Error
finishreceive.pl was buggy when AcqCreateItem was set to recieve (wrong API)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 07:49:08 -05:00
Paul Poulain
c26b6957b5 MT 2348 : acqui-home minor improvements
- moving some links to the left part of koha (currencies and suggestions)
- removed currency table
- changing supplier display

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-17 07:18:44 -05:00
Colin Campbell
fc2120c6df Bug 4163 Preserve budget value unless changed by user
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 19:39:48 -05:00
Colin Campbell
e244e094c6 bugfix suppress warnings coming from acquisitions homepage
Before formatting and doing arithmetic with them we should
ensure undefined numeric elements are numbers
(This should be enforced in the db)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 19:39:44 -05:00
Colin Campbell
c3d1b33a2a Remove cause of some warnings in order display
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 07:39:46 -05:00
513c76121c fixed remaining calls to GetMember() that used old argument style
New way, correct way to use GetMember is

GetMember(field => fieldvalue[, field2 => field2value ...]);

e.g.,

GetMember(borrowernumber => $borrowernumber);

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 08:24:05 -05:00
b0f4d7104c removed unconditional warn
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 08:23:55 -05:00
Colin Campbell
e321fc9184 Bug 4108 Catch cases when GetMember is generating errors
Fixed two calls where new interface was not used
Arguably new syntax allows more options than we require but it was not catching
error cases (when 0 or undef is passed). It also can now be called in ways
which would validly return multiple hits but explicitly does not
(nor does calling code expect this)
This patch should quieten the flood of errors

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 07:57:26 -05:00