Commit graph

30 commits

Author SHA1 Message Date
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
Chris Cormack
46c953b04c Merge remote branch 'kc/new/bug_5059' into kcmaster 2010-11-13 11:33:45 +13:00
3152938684 Bug 5059: Inconsistent use of ordering price and list price in vendor form
Changes Ordering price to List price and make spelling more consistent.

Patch originally send for 3.2, still applied to HEAD without conflicts.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 11:31:53 +13:00
Katrin Fischer
d39dd6d857 BUG 5058: small layout correction of vendor form
Rebased to HEAD, should also apply to 3.2

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 11:31:27 +13: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
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
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
Matthias Meusburger
0b5cc8f809 MT2345 : Changes on contracts 2010-01-28 15:11:51 +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
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
Chris Cormack
3fae8fa97a Bug 3877 - Fixing layout of radio buttons 2009-12-20 14:27:50 +01:00
Paul Poulain
89c0cda081 [replace previous] fix for 3612 (bookseller improvements)
- removing useless fields from aqbooksellers table: specialty, deliverydays,followupdays,followupscancel,nocalc, invoicedisc They were in the DB schema, but unused for years
- reworked bookseller and contract gui
- no warning thrown

NOTE : updatedatabase not done for field removal in aqbooksellers table. Should have:
ALTER TABLE `aqbooksellers`
  DROP `deliverydays`,
  DROP `followupdays`,
  DROP `followupscancel`,
  DROP `specialty`,
  DROP `nocalc`;
2009-09-30 11:30:34 +02:00
Paul Poulain
f807360373 supplier management changes
* deal with granular permissions
* deal with GST at bookseller level
2009-09-30 11:30:17 +02:00
7b2e4ebce2 A few more en-US spelling corrections; Markup corrections; Standardizing on "email" instead of "e-mail"; Copying isbn-formatting from opac-detail.pl to detail.pl;
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-09 10:53:02 -05:00
Joshua Ferraro
f78b79da6c nomenclature cleanup for acquisitions:
supplier -> vendor
freight -> shipping
parcel -> shipment
shopping basket -> basket
parcel code -> invoice number

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 20:04:56 -06:00
Ryan Higgins
94036d8490 Fix for bug 1251 (blank supplier name)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 15:49:06 -06:00
1fb6279ddd A couple of changes towards fixing Bug 1165 (GST in PROG templates)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-26 19:49:17 -06:00
fa18d24cb7 Enabling yuipath system preference for choosing local or Yahoo-hosted YUI js library includes. Removing yui-toolbars.inc include.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-08 18:06:43 -06:00
63cb08fc8d Enabling AutoComplete on resident circ search form. Putting dependent YUI files into doc-head-close.inc along with button/menu-related YUI js and css. Moving menu.css, button.css, and dependent graphics into lib/yui. Removing "yui-skin-sam" class from body tags and altering css accordingly.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-04 16:31:18 -06:00
9ee41cf025 Some formatting and layout chances to acquisitions pages. Taking out table filter-style search form on histsearch.pl and replacing it with standard advanced-search style form list.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-02 08:01:11 -05:00
1eb4513d43 Standardizing YUI toolbar
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-20 17:05:41 -05:00
ddfe9f2c26 More work on global resident search, toolbars, and menus.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-05 13:56:46 -05:00
33f8001652 Cleaning up acquisitions, adding breadcrumbs, adding resident search. Other minor corrections.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-25 14:46:51 -05:00
039df85cf9 Moving inline script blocks to <head> where possible
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-04 16:35:52 -05:00
Paul POULAIN
ec282e07b4 BUGFIX : missing <!-- /TMPL_IF -->
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-04 05:49:32 -05:00
c44f56fcac Moving </head><body> into body of templates so that js and css can be embedded per-page.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-30 15:50:54 -05:00
3262d91a16 Modifications to enable YUI-Grids layout structure. Unfinished.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-28 16:50:42 -05:00
c6131c4429 Corrections for XHTML compliance, again.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-28 16:50:18 -05:00
Joshua Ferraro
d08387dd28 first go at moving templates to a modules/ dir
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-23 21:11:27 -05:00
Renamed from koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl (Browse further)