#906 1.4 upgrade 1.2 - 1.4 fails

[turtle]

sql/1.2-1.4.sql fails in 2 places
In SELECT account__save a missing () around a sub statement that contains an END that ends the file there.
and the other was a
problem with the insert to makemodel fails due to the new column barcode being in the makemodel table.

[Chris Travers]

Patch applied in 6405.