Commit graph

54486 commits

Author SHA1 Message Date
tonnesen
62e0baa92a Minor changes 2002-07-04 19:42:48 +00:00
tonnesen
60a72c67fe Beginning of authentication api. Applied to shelves.pl for now as a test case. 2002-07-04 19:21:29 +00:00
tonnesen
7d616eca8b bug fix 2002-07-04 18:05:36 +00:00
tonnesen
084045c40c Merged changes from rel-1-2. Abstracted table structure changes by alan. 2002-07-04 16:41:06 +00:00
tipaul
528f1b2b80 Long is the road to MARC..
Not related to MARC :
* removed HLT- empty link when no basket for a supplier (should be useful to copy this into rel-1-2 i think)
* fixed some "use of uninitialized value"
related to MARC
* changed use Acquisition to use Catalogue, new package for MARC management

For instance, nothing is done to MARC DB, but structure is modified (see Biblio.pm for details), and everything seems to work : it's still possible to use acqui, and it fills old-DB pretty good.

WARNING : if you work on main trunk, please note Acquisition.pm is NO MORE USED in /acqui/ system. Every sub in Acquisition.pm has been moved to Biblio.pm or Catalogue.pm.
2002-07-04 15:53:02 +00:00
tipaul
fbe10b879f merging 1.2 and main branches. main branch now uses ethnicity SQL table 2002-07-04 13:53:56 +00:00
tipaul
b319b74787 merging 1.2 and main branches 2002-07-04 13:05:52 +00:00
tipaul
213daac431 only 1 change : buttun-add-new instead of button-add-variable.
Other diffs are due to "explanation" row adding, only in main branch
2002-07-04 12:46:42 +00:00
tipaul
ec25ca4dfd bugfix from merging 2002-07-04 12:28:54 +00:00
tipaul
bd04fceca8 merging 1.2 and main branches 2002-07-04 10:42:31 +00:00
tipaul
057fd6af5c merging 1.2 and main branches 2002-07-03 12:41:01 +00:00
tonnesen
17bb4d7343 Fixed bug in checkvalidisbn() 2002-07-03 03:18:50 +00:00
rangi
d6f9a61c7d Fixed so datelastseen is updated on the item record for every issue or return 2002-07-02 23:31:33 +00:00
tonnesen
219e006412 merging changes from rel-1-2 2002-07-02 22:08:50 +00:00
tonnesen
682ae23959 Merging bug fix from rel-1-2 2002-07-02 21:46:52 +00:00
tonnesen
40ae0c4c84 Added from rel-1-2 branch 2002-07-02 21:37:56 +00:00
tonnesen
a13b6937bf Merged over from rel-1-2 2002-07-02 20:59:11 +00:00
tonnesen
68e13b2c78 Removed use warnings; which breaks perl 5.005 2002-07-02 20:49:44 +00:00
tonnesen
a119883471 Copying missing files from rel-1-2 to trunk 2002-07-02 20:35:17 +00:00
tonnesen
1a6b88483f module added from rel-1-2 branch 2002-07-02 20:31:33 +00:00
tonnesen
dcfb3b835c Merged SimpleMarc.pm over from rel-1-2 2002-07-02 20:30:15 +00:00
tonnesen
40bffc1f0e Merged in updates from rel-1-2 2002-07-02 17:48:06 +00:00
tipaul
157d4a34f0 merging 1.2 and main branches. Only 1 line merged, as all diffs are due to finlay's rewritting of this script. 2002-07-02 15:59:53 +00:00
tipaul
004519edbc Merge from 1.2 and main branches 2002-07-02 15:46:42 +00:00
rangi
c4d0d2f54e Regex to change the javascript to make cursor start in barcode box 2002-06-28 23:43:16 +00:00
tipaul
a74189dac9 merging 1.2 and main branches 2002-06-28 12:53:02 +00:00
tipaul
628783cb30 merging 1.2 and main branches 2002-06-28 12:19:50 +00:00
tipaul
466a1e3837 merging 1.2 and main. Diffs are due to new features. 2002-06-28 12:07:16 +00:00
tipaul
33947ff039 merging 1-2 and main. 2002-06-28 08:53:51 +00:00
tonnesen
46c2ff9804 Merged in optional ethnicity fix from rel-1-2 2002-06-27 21:16:20 +00:00
tonnesen
a39e9a34c0 Fixed bug. $sth->execute after $sti->prepare. 2002-06-25 16:59:27 +00:00
dragon28
504d1c22e0 fixed a typo 2002-06-25 11:05:45 +00:00
dragon28
7266332902 fixed a typo 2002-06-25 10:58:07 +00:00
tonnesen
1ac576e81b removed "use warnings" 2002-06-24 21:54:44 +00:00
tonnesen
d5fbd761f5 Switched button-add-member to button-add-new in /admin/ scripts. 2002-06-24 18:40:56 +00:00
tipaul
4f51774662 merging rel-1-2 and main 2002-06-24 15:00:13 +00:00
tipaul
bdd324f187 merging of rel-1-2 and main branch 2002-06-24 14:16:36 +00:00
tonnesen
b1cb688dc7 Perl 5.005 doesn't like the -I after the script name. (This doesn't
look very functional yet in any case, but thought I'd put it in as a
fix)  :)
2002-06-24 13:19:40 +00:00
finlayt
457430776c Checked diff in branchtransfers. datesent and datearrived are given datetime, not just date 2002-06-23 22:38:08 +00:00
tipaul
d467f092a3 merging branches 1.2 and main 2002-06-21 13:15:36 +00:00
tipaul
4d40d7af28 MERGE 1.2 and main branches
Still a few diffs i don't understand :

311,320c311,312
<   categoryname text,
<   codedescription text,
<   PRIMARY KEY (categorycode)
< );
<
< # Table structure for table 'branchrelations'
< #
< CREATE TABLE branchrelations (
<   branchcode varchar(4) DEFAULT '' NOT NULL,
<   categorycode varchar(4) DEFAULT '' NOT NULL
---
>   branchcode char(4) DEFAULT '' NOT NULL,
>   branchholding int(11)
344c336
<   datesent datetime DEFAULT '0000-00-00' NOT NULL,
---
>   datesent date DEFAULT '0000-00-00' NOT NULL,
346c338
<   datearrived datetime,
---
>   datearrived date,
553a546
>
2002-06-21 08:55:50 +00:00
tipaul
3bee5b5743 * Acquisition synchronised with rel-1-2
* Update of biblio.pm and catalogue.pm that continuates MARC stuff. Lot of explanations at the beginning of Biblio.pm
2002-06-20 21:07:30 +00:00
tonnesen
d6e7293f76 Cosmetic change. Merged with rel-1-2 2002-06-20 20:43:26 +00:00
tonnesen
cceee9e230 Merged changes from rel-1-2 2002-06-20 20:41:21 +00:00
tonnesen
1929403b8f Merged with rel-1-2 copy 2002-06-20 20:31:01 +00:00
tonnesen
264b8f0093 Merged changes from rel-1-2 branch version 1.21.2.1, all fixes to warnings 2002-06-20 20:10:08 +00:00
tonnesen
6897cec04d Most of these merges are just removing unused parts of the perl modules. 2002-06-20 18:56:52 +00:00
tonnesen
04dd31fa07 47 files to go, 47 files to go, take one down, pass it around...
46 files to go.
2002-06-20 18:17:51 +00:00
tonnesen
d3af19dcb2 Are we getting sick of merging yet? Not me! 2002-06-20 18:04:45 +00:00
tonnesen
29b4d2d534 merges from rel-1-2. Starting to get a little longer now. Being very
careful.
2002-06-20 17:57:11 +00:00