Commit graph

41 commits

Author SHA1 Message Date
Savitra Sirohi
589aac1540 Bug 5466 - Acquisitions - ability to set currency in order screens
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-21 16:51:40 +13:00
Nicole C. Engard
d6718e14e7 Bug 5820: Change language to 'Fund' over 'Budget'
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-06 08:40:28 +13:00
Dobrica Pavlinusic
7fd062814d Bug 4920 - neworderempty.tmpl shouldn't call calcNeworderTotal() onload
Currently, modifying existing orders will recalculate values if exchange rate
has changed, which destroys previous data (our use case is just to modify
Planning value fields).

Since fields also have onChange event which also triggers caclNeworderTotal,
onload event seems redundant.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-17 20:53:04 +13:00
9a048e2b12 Bug 5446 Fix a bug introduces by previous patch
When AcqCreateItem was set to 'cataloguing' there was no items fields in the
acq web form to validate in JS...

Alert commented.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:25:09 +13:00
f.demians at tamil.fr
76264638cc Bug 5446 Item creation in Acquisition module doesn't control mandatory field
Add some JS validing form, so saving an order is blocked if any item mandatory
field is empty.

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
2010-12-12 07:50:27 +13:00
ed0ccd9f57 Bug 4979: Acq: input fields for new record are too short
Patch rebased to HEAD, should also apply to 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-13 06:40:22 +13:00
Chris Cormack
f0fc240e91 Merge remote branch 'kc/new/for-3.4/spelling' into kcmaster 2010-11-02 11:33:49 +13:00
Colin Campbell
0089c9d229 Bug 5224 Remove the adjective Shopping from basket
New orders breadcrumbs were using the inappropriate term
Shopping basket whereas basket is used elsewhere

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-02 11:19:53 +13:00
Bernardo Gonzalez Kriegel
ad06fd90c6 Misspell: Quanity -> Quantity
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-17 13:47:06 -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
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
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
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
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
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
89f9042a38 Fix for Bug 3944, new order template formatting and markup corrections 2009-12-20 14:31:44 +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
937e0d73df fix for #3620: basket management
- basket.pl: updating display, formatting dates,
- neworderempty: updating display, removing useless code, using ACQ framework if it exist. The ACQ framework will be used for creating items record during acquisitions. If it does not exist, default is used instead (which has many more informations, lot of them being irrelevant during acquisition, like the barcode)
- new order from imported batch: rewrite of the workflow. Now uses neworderempty and changing status of import_record to 'imported'
- s/copyrightdate/publicationyear/ as it's what libraries uses when ordering
- fixing some warnings
-
2009-09-30 11:30:34 +02:00
Paul Poulain
85c9138b35 removing useless code (copied from addbiblio) 2009-09-30 11:30:23 +02:00
Paul Poulain
e288d6a738 neworderempty, changes
* deal with import from staged file
* deal with z3950 import
* deal with granular permissions
* deal with uncertain price
* deal with create item if SysPref set to create items on ordering
2009-09-30 11:30:17 +02:00
Joe Atzberger
01230ccd5e Minor rework of template js.
Lines explicitly ended with semicolons.  Allow some better behavior if TMPL_VAR's
are undefined or zero.

Note FIXME added.  I believe this is part of the fragmentary integration of
Katipo code for GST.  Would be obliged if someone with access there can confirm.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-02-02 08:20:50 -06:00
0a33d4554b Markup corrections, style fixes, and other minor bugs, including fix for Bug 2679 ("Dates Changing on Funds When Editing")
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-22 13:34:36 -05:00
182f9df495 More fixes for Bug 2600, enabling the appearance of HTML tags in item titles. Resubmission.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-26 09:06:13 -05:00
730ef80520 Spelling corrections: organisation->organization, authorise->authorize, catalogue->catalog
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-02 15:43:29 -05:00
Joshua Ferraro
2a8592ceaf Updating for translation (capitalization normalization) 2008-07-07 23:32:27 -05:00
Joe Atzberger
37d6cb2a41 acqui - template cleanup of toggle "highlight" and required field formatting
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-08 11:19:25 -06:00
9f3722ac00 A few minor markup corrections.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 01:20:34 -06: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
4b089e1eee updates to acqui - first of several commits
bug fixes to display and save publishercode and purchase order numbers.
use invoice number in place of parcel code
fix template apparently allowing user to modify biblio details on add/mod order
removing CGI scrolling_list

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 15:07:02 -06:00
Joshua Ferraro
8d726bf96c nomenclature improvements for translation
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-20 16:18:25 -06:00
Joshua Ferraro
20055da807 Fixing nomenclature and tmpl_process3.pl bugs
tmpl_process3.pl still throws some multi-byte warnings
but no markup errors

There are still quite a few places we could normalize
to reduce the size of the translation file

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-11 18:37:01 -06:00
f69e913c8b Some random changes, including search box and toolbar for bookfunds, formatting of change language block in the footer, fix for delete shelf bug.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-07 08:13:57 -06:00
fa99edd8b3 Some markup fixes
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-06 06:29:52 -06: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
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/neworderempty.tmpl (Browse further)