This feature seems to have made it into HEAD.

Hie,

I have to reopen this bug because an essential part is missing : the modification of kohastructure.sql.

I have installed a new database with 3.2.0 version and the basket group saving didn't work. So I found that fields "deliveryplace", "deliverycomment" and "billingplace" where missing in "aqbasquetgroups" table.

See proposed patch.

Regards,

This bug is mentioned in:
Bug 3624 reopened http://lists.koha-community.org/pipermail/koha-patches/2010-December/013136.html
Bug 3624 reopened http://lists.koha-community.org/pipermail/koha-patches/2010-December/013139.html
Bug 3624 reopened http://lists.koha-community.org/pipermail/koha-patches/2010-December/013143.html

Fridolyn, unless i'm mistaken, you haven't updated your patch.

Marquing this as BLO, as the DB structure is invalid and acq don't work anymore

Signed off on the patch, but I have a question.  For new installs who didn't have this should there also be a follow up to add these fields in an upgrade if they're missing?  I mention this because I have a new install without those fields and I won't get them unless I add them in manually.

Yes there should be Nicole, Ill do a follow up patch for that.

Pushed, please test and mark resolved

Why did the patch for xhtml validity not been pushed?

I tested this patch. 

It works but i noticed that the billing place isnt saved if you dont select a lirary in the drop-down list box. Is it a side effect? Do i open up a new bug?

I also did selenium tests with the firefox addon. If anyone want these to replay the tests I did, let me know.

Patch for xhtml validity needs to be redone for TT.
Checked problem still exists in this template on master.

All that is remaining is the xhtml fix, patch attached

On two recently updated installations, I've seen the deliveryplace, deliverycomment, and billingplace columns fail to be inserted into the table by updatedatabase.pl.  Can anyone else confirm that upgrading from pre-3.03.00.023 to current HEAD fails to update the database appropriately, or is this a local problem for me?

an idea :
The deliveryplace & deliverycomment are added in 3.01.00.0094
and the 03.00.0023 does a test/check :
my $sth = $dbh->prepare("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'aqbasketgroups' AND COLUMN_NAME = 'billingplace'");
$sth->execute;
$dbh->do("ALTER TABLE aqbasketgroups ADD billingplace VARCHAR(10)") if ! $sth->fetchrow_hashref;

maybe there is something wrong with this check and the ALTER TABLE is not done.
Do you have a backup with what you had before the update ?

Paul,


That seems likely; I'll try pulling an older-version update, and checking the update process.

ian, once you have more details, give me the bug back, or close if no more relevant

The attached patch introduces translation problems (bug 6458). Problem was fixed by http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=5131
Removing needs sign-off.

Owen, it's unclear for me why you've removed the "patch sent". Could you give more details pls ?

Paul,

There is no non-obsolete patch attached, so it was decided in IRC to remove the patch-sent status until we could get more information.  Is there a pending patch that needs signoff or QA?

Ok, I have looked into this:

NEW INSTALLATIONS 
kohastructure.sql seems correct now. I also checked a new database, all fields are there.

DROP TABLE IF EXISTS `aqbasketgroups`;
CREATE TABLE `aqbasketgroups` (
  `id` int(11) NOT NULL auto_increment,
  `name` varchar(50) default NULL,
  `closed` tinyint(1) default NULL,
  `booksellerid` int(11) NOT NULL,
  `deliveryplace` varchar(10) default NULL,
  `freedeliveryplace` text default NULL,
  `deliverycomment` varchar(255) default NULL,
  `billingplace` varchar(10) default NULL,
  PRIMARY KEY  (`id`),
  KEY `booksellerid` (`booksellerid`),
  CONSTRAINT `aqbasketgroups_ibfk_1` FOREIGN KEY (`booksellerid`) REFERENCES `aqbooksellers` (`id`) ON UPDATE CASCADE ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

UPDATED INSTALLATIONS
Installations updating from a version number below 3.01.00.94 should be ok. I checked the sql statements are correct.
First update in updatedatabase.pl:
$DBversion = "3.01.00.094";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do(qq{ALTER TABLE aqbasketgroups ADD deliveryplace VARCHAR(10) default NULL, ADD deliverycomment VARCHAR(255) default NULL;});

$DBversion = "3.01.00.097";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do(qq{ALTER TABLE aqbasketgroups ADD billingplace VARCHAR(10) NOT NULL AFTER deliverycomment;});

NEW INSTALLATIONS CREATED WHILE FIELDS WHERE MISSING
I have removed the 3 columns from my database and added the code below as 3.06.00.001 to my updatedatabase. The updatedatabase reported no errors, but the columns were NOT added to my databse. 

$DBversion = '3.03.00.023';
I created a branch for an old version of Koha (3.02.04.000) and recreated my database from scratch. The 3 columns are missing from aqbasketgroups. I checked out back to master and ran the web installer. Got some complaints about privacy and:

Upgrade to 3.03.00.023 done (Reconcile aqbasketgroups)
Confirmed that columns were correctly added to the datebase.

if (C4::Context->preference("Version") < TransformToNum($DBversion) && $original_version < TransformToNum("3.02.05.002")) {
    my $sth = $dbh->prepare("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'aqbasketgroups' AND COLUMN_NAME = 'billingplace'");
    $sth->execute;
    $dbh->do("ALTER TABLE aqbasketgroups ADD billingplace VARCHAR(10)") if ! $sth->fetchrow_hashref;
    $sth = $dbh->prepare("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'aqbasketgroups' AND COLUMN_NAME = 'deliveryplace'");
    $sth->execute;
    $dbh->do("ALTER TABLE aqbasketgroups ADD deliveryplace VARCHAR(10)") if ! $sth->fetchrow_hashref;
    $sth = $dbh->prepare("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'aqbasketgroups' AND COLUMN_NAME = 'deliverycomment'");
    $sth->execute;
    $dbh->do("ALTER TABLE aqbasketgroups ADD deliverycomment VARCHAR(255)") if ! $sth->fetchrow_hashref;
    print "Upgrade to $DBversion done (Reconcile aqbasketgroups)\n";
    SetVersion ($DBversion);
}

XHTML VALIDITY
Checked on current master. Ok.

I am marking this closed, please reopen if I missed something.

Ok, some things got mixed up down here:

"NEW INSTALLATIONS CREATED WHILE FIELDS WHERE MISSING
I have removed the 3 columns from my database and added the code below as
3.06.00.001 to my updatedatabase. The updatedatabase reported no errors, but
the columns were NOT added to my database"

This didn't work, because the database update was also checking for the version number - so I went back and created a real old database to test it correctly.
And this WORKED. :)