Fix for update 21, when converting addresses

I just tried to upgrade from 4.6 to 4.7 and update.php fails on me with a large list of warnings. Is there a need in the community that I document all the manual changes that will be necessary to upgrade to ecommerce 4.7 or am I the only one?

OK I will keep track of the changes and try to produce the necessary SQL and submit it to the handbook.

Drupal 4.6.5 with ecommerce 4.6 (early version patched to make it work) and the following ec modules active:
address, cart, cod, generic, payment, paypal, product, shipping, store, and tangible.

* Made a backup of all the drupal directory and the MySQL database.
* Deleted everything, and installed latest version of Drupal 4.7.x core files and the contributed modules that I had active, among them ecommerce of course.
* Restored from backup the themes, sites and files directory and other CSS files I had changed (drupal.css, nice_menu.css etc.)

* I ran update.php accepting defaults.

* After that I opened MySQL and saw the following differences with a fresh install of Drupal 4.7 with ecommerce:

I might not need it, but did it anyhow:

CREATE TABLE `ec_credit_card` (
`txnid` int(10) unsigned NOT NULL default '0',
`cc_amount` decimal(10,2) NOT NULL default '0.00',
`cc_ordernum` varchar(32) NOT NULL default '',
`cc_refnum` varchar(32) NOT NULL default '',
`cc_reason` varchar(128) NOT NULL default '',
PRIMARY KEY (`txnid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

ALTER TABLE `ec_product` CHANGE `price_cycle` `price_cycle` INT( 11 ) NOT NULL DEFAULT '0'

ALTER TABLE `ec_product_tangible` ADD PRIMARY KEY ( `vid` )

ALTER TABLE ec_transaction_product DROP data
ALTER TABLE ec_transaction_product CHANGE product_data data TEXT DEFAULT NULL

Then without changing anything else I looked at the site and most of it looked the same, but:

- when i go to the existing transactions, and look at the addresses of a transaction, they are all empty
- when I look at an invoice of a transaction, the addresses are missing.
- when add something to cart and checkout no payment choice is given (COD should have been offered, Paypal is automatically chosen, nothing else)

Any suggestions before I start debugging this on monday?

I already discover the problem with the addresses. In the update process only a number of addresses were transferred, not all. I don't know why yet.

To fix the problems with addresses, I decided to do it all over again and switch off upgrade 21, that failed to move all transaction addresses correctly. I manually created and inserted the the new transaction addresses using two SQL queries; much simpler then the used script in update 21. See the attached the patch to change it.