Commit graph

188 commits

Author SHA1 Message Date
Alex Arnaud
657ce474c6 (BUG #4810) parcel.pl: Fix a bug with applying a filter on pending orders displaying
When we apply a filter and click on "Click here to show x items" link, there are duplicates orders which are display.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 20:42:33 -04:00
Alex Arnaud
f0233c4f33 (MT2371) basket.tmpl, in basket details, change Open on => Opened on
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 14:29:11 -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
4d8863bbdb Fix for Bug 4278, canceling vendor add refreshes wrong
Patch corrected to follow HDL's suggestion that link check
for existing vendor id and conditionally redirect based
on that.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:22 -04:00
Garry Collum
b717110c14 But 4890: Fixes invalid XHTML in basket.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:13 -04:00
Garry Collum
8876393d16 Bug 4889: Fixes minor XHTML error in booksellers.tmpl.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:12 -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
38b16e34fd fix various errors reported by xt/author/translatable-templates.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 08:36:21 -04:00
Nicole Engard
f316cdc28f bug 3981 follow up change GST to 'Tax Rate' in EN-US
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 23:53:19 -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
2f67f7c610 (BUG #4352) Adding a popup at removing of a basket
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:11 -04:00
Alex Arnaud
97f6e49020 (BUG #4351) The save button don't really save. Renaming in Next button
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:10 -04:00
Alex Arnaud
911eb24b16 (BUG #4350) parcel.tmpl: add Translatable text
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:09 -04:00
Alex Arnaud
a2007e1f48 (BUG #4349) In parcel.pl: replaces All x items are displayed by x items are displayed
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:06 -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
c35d6e6bd4 (BUG #4344) Basket.pl - remove the line "contract number"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:25:02 -04:00
Alex Arnaud
e594317f4d (BUG #4332) Changed the display of ordered search results
Changing the display of the basket column: changing "basketNumber" to "my
basket (basketNumber)".
Adding the Basket group column with fallowing display: "my group (group
Number)"

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-29 21:20:10 -04:00
Alex Arnaud
b214eace34 (MT3174) acqui/neworderempty.pl: incrementing the quantity when adding an item
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-23 06:57:51 -04:00
Nicole Engard
626314cf3e bug 4391 fix a series of minor text styles and
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-22 09:12:31 -04:00
Nicole Engard
18fbeba320 bug 4391 - fix minor typos
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-22 06:15:20 -04:00
Lars Wirzenius
4523a2df0d Fix file permissions: if it is not a script, it should not be executable.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-16 00:40:34 -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
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
Garry Collum
5fc0c4968d Bug 4180: Fixes unclose TMPL_IF in supplier.tmpl
Also fixes a minor XHTML error.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 14:27:41 -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
Henri-Damien LAURENT
209637695d bug 3893 : No way to see late orders
When no lateorders were found, there was no way to change the limit in order to check for older orders

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 08:41:48 -05:00
Colin Campbell
e2e7f0d050 Correct misleading text
Some koha acq terminology is confusing to new users so lets at least
be consistent in our usages we are adding to the basket here not an order

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 09:54:59 -05:00
2ce51846a0 More fixes for Bug 2600, HTML tags in titles not escaped in many places
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 16:52:31 -05:00
cd921163c0 Fixes for Bug 3089, Date entry fields should indicate required date format
- Added include, date-format.inc, which shows format, e.g. "(DD/MM/YYYY)"
- Hint shows expected date format based on system preference
- Removing calendar.inc include from templates which don't use it

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:12:18 -05:00
Nicole Engard
2616faf132 follow-up to bug 3854: resolve budget period language issues
top level: "Root Budget" becomes "Budget"
second level: "Budget" becomes "Fund"
third level and below: "Sub-Budget" is also a "Fund", but for things
like the "create sub-budget" link, they'll be changed to "create child
fund".

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:11:19 -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
c219a8c482 [MT2390] Added tablesorter on staged files 2010-01-28 15:11:54 +01: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
55ece2a028 [MT2370] Fixed basketheader breadcrumb
There was to link to get back to the supplier.
2010-01-28 15:11:53 +01:00
Jean-André Santoni
8ecfe0f756 [MT2370] Basket header display improvement
The name is mandatory, it is now displayed in red.
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
Jean-André Santoni
5ff80cb233 [MT2346] Supplier display improvements
Used Koha generalized way to display lists of informations.
2010-01-28 15:11:47 +01:00
4b60c8a9aa Fixes for Bug 3958, Standardize vendor/supplier/bookseller terminology
Changing instances of "supplier" or "bookseller" to "vendor."
2010-01-25 18:37:12 +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
Nicole Engard
7ad3128227 bug 3978 fix column display on vendor search results 2009-12-22 19:14:52 +01:00
89f9042a38 Fix for Bug 3944, new order template formatting and markup corrections 2009-12-20 14:31:44 +01:00
90b83dbd90 Fix for Bug 3960, moving filter form to the sidebar. 2009-12-20 14:28:28 +01:00
40074eaeec Fix for Bug 3949, "already received box has funny shading" and other cosmetic changes
- moving filter form to sidebar
- correcting markup
- moving table row show/hide message out of the table and adjusting for zero- vs. 1-based js counts
2009-12-20 14:28:28 +01:00
5e9ad32707 Fix for Bug 3956, Basket details table headers misaligned 2009-12-20 14:28:28 +01:00