Commit graph

349 commits

Author SHA1 Message Date
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
Colin Campbell
dde8191aa5 Bug 3808 Display correct number of records in neworderbiblio screen
New version of patch to apply against 3.2alpha
Also remove related FIXME message that was displaying to the user

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:09:31 -05:00
Jean-André Santoni
6961f2e757 [MT2390] Fixed addorderiso2709 breadcrumb
Booksellername was not showing.
2010-01-28 15:11:54 +01:00
Jean-André Santoni
6247c38600 [MT2370] Basket header workflow improvement
The "Data Recorded" page was useless, I removed it.
2010-01-28 15:11:53 +01:00
Jean-André Santoni
696a9cb601 [MT2593] Fixed budget amount computation in acqui-home 2010-01-28 15:11:53 +01:00
Jean-André Santoni
c6027e73c5 Fixed a major bug in ModReceiveOrder
Orders were not splited correctly.
2010-01-28 15:11:53 +01:00
Jean-André Santoni
022978d4f4 [MT2593] Added "ordered" column in acqui-home budget display 2010-01-28 15:11:52 +01:00
Matthias Meusburger
0b5cc8f809 MT2345 : Changes on contracts 2010-01-28 15:11:51 +01:00
Matthias Meusburger
5f61beed72 MT2408 : UI Changes / CSV Export 2010-01-28 15:11:48 +01:00
Matthias Meusburger
d8a71ebd61 MT 2426 : Default currency is chosen for price calculation when bookseller's listprice is NULL 2010-01-28 15:11:47 +01:00
Nicole Engard
b5312a17cb Bugs: 3965, 3979, 3981 - GST changes in acquisitions
This patch fixes three bugs:

Bug 3965: gist sys pref not taken into account
 changed it so that GST does not show on basket if gist pref set to 0
 changed it so that GST fields don't appear on vendor record if gist pref=0

Bug 3979: gst options not lining up
 fixed layout on vendor add/edit form so GST radio buttons line up right

Bug 3981: GST confusing in en-US
 there is no GST in the US and so GST changed to 'Tax' in templates

Also, a small spacing fix was made to the path on the basket grouping
template.
2009-12-22 19:14:52 +01:00
231ea7c341 Bug 2505 enabling warnings 2009-12-20 14:31:35 +01:00
Matthias Meusburger
9f41fe64be MT 2050, Follow-up, Fast Cataloging
Adds granular permissions for cataloging
Also adds a link from the circulation home to fast cataloging when fast cataloging is active
2009-11-24 10:05:10 +01:00
Henri-Damien LAURENT
a9ae673ba1 followup finishreceive.pl 2009-11-19 17:34:27 +01:00
Paul Poulain
0e91f6ae0f reindenting and removing tmpl_if in doc-head-close 2009-11-17 17:57:41 +01:00
Jean-André Santoni
03c51600a0 [3.2.x](bug #3623) Alternative 2 pages layout for hte PDF
This new template shows the order list of all the baskets in one big table.
2009-11-17 16:27:12 +01:00
Jean-André Santoni
eff46d395e Adds billing address support in the basketgroup.
Also fixes a bug in ModBasketgroup, and renames the PDF uploaded to the client.
2009-11-04 13:17:09 +01:00
Jean-André Santoni
7e872e0a1f [3.2.x](bug #3623) PDF printing enhancements
Renamed pdfformat to OrderPdfFormat and created OrderPdfTemplate to stock the PDF in the database.
Added a new type of syspref nammed "Upload".
Rewritte, translation and cleaning of the PDF template.
2009-11-03 16:35:29 +01:00
Jean-André Santoni
d61161a3d5 [3.2.x](bug #3624) Per-basketgroup delivery place
Librarian are now able to select a different delivery place for each basketgroup. They can choose one from the branch list or manualy using a textarea.
Database schema and PDF generation have been modified to reflect these changes.
2009-11-02 17:02:02 +01:00
Paul Poulain
748b9db276 fixing "close basket and create basket group" feature
the checkbox was not functional, now it is.
2009-10-30 13:49:39 +01:00
Henri-Damien LAURENT
b22bde5263 Acquisition : Fixing
neworderempty : problems with data updates
booksellers.tmpl : TMPL_VAR not in comments
list_price becomes listprice in neworderempty script as in acq.js
2009-10-30 01:56:20 +01:00
Henri-Damien LAURENT
1ec6e3df73 Change in API : ordnum becomes ordernumber 2009-10-30 00:30:47 +01:00
Paul Poulain
a1fe8bae96 removing hardcoded value 2009-10-29 17:56:44 +01:00
Paul Poulain
dc85da1830 suggestions improvements and fixes
- reindenting Suggestions.pm
- removing useless code in acqui-home.pl & fixing # of pending suggestion display
- add suggestion to order : displaying for selection suggestions accepted by the librarian (and reindenting)
- XHTMLing acqui-home (& removed useless parts)


NOTE ABOUT XHTML (could be useful) : <tfoot> must be BEFORE <tbody> in a <table>, even if, of course, it is displayed after.
2009-10-29 17:56:44 +01:00
Henri-Damien LAURENT
89b5bf0272 MT 2206 addorder crashing 2009-10-26 15:33:21 +01:00
Henri-Damien LAURENT
7d9cb654b1 Bug Fixing addorder.pl 2009-10-20 12:24:07 +02:00
Henri-Damien LAURENT
3ba54d73c9 using SQLHelper in C4/Acquisition
Changing addorder to send orderinfo from input decoding
And using SQLHelper to filter information
2009-10-06 13:34:56 +02:00