diff --git a/bin/addons/base/res/bank.py b/bin/addons/base/res/bank.py index 4fd2c913147..1a16208403f 100644 --- a/bin/addons/base/res/bank.py +++ b/bin/addons/base/res/bank.py @@ -33,7 +33,7 @@ class Bank(osv.osv): _description='Bank' _name = 'res.bank' _columns = { - 'name': fields.char('Name', size=128, required=True), + 'name': fields.char('Name', size=128), 'code': fields.char('Code', size=64), 'street': fields.char('Street', size=128), 'street2': fields.char('Street2', size=128), diff --git a/doc/migrate/4.0.0-4.2.0/pre.py b/doc/migrate/4.0.0-4.2.0/pre.py index b9ab20a12ce..1ea4cea4738 100644 --- a/doc/migrate/4.0.0-4.2.0/pre.py +++ b/doc/migrate/4.0.0-4.2.0/pre.py @@ -177,11 +177,37 @@ cr.commit() cr.execute('SELECT a.attname FROM pg_class c, pg_attribute a, pg_type t WHERE c.relname = \'product_uom\' AND a.attname = \'factor\' AND c.oid = a.attrelid AND a.atttypid = t.oid AND t.typname = \'float8\'') if cr.fetchall(): + cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_planning_stat_account\'') + if cr.fetchall(): + cr.execute('DROP VIEW report_account_analytic_planning_stat_account') + cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_planning_stat\'') + if cr.fetchall(): + cr.execute('DROP VIEW report_account_analytic_planning_stat') + cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_planning_stat_user\'') + if cr.fetchall(): + cr.execute('DROP VIEW report_account_analytic_planning_stat_user') + cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_purchase_order_product\'') + if cr.fetchall(): + cr.execute('DROP VIEW report_purchase_order_product') + cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_purchase_order_category\'') + if cr.fetchall(): + cr.execute('DROP VIEW report_purchase_order_category') + cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_sale_order_product\'') + if cr.fetchall(): + cr.execute('DROP VIEW report_sale_order_product') + cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_sale_order_category\'') + if cr.fetchall(): + cr.execute('DROP VIEW report_sale_order_category') + cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_hr_timesheet_invoice_journal\'') + if cr.fetchall(): + cr.execute('DROP VIEW report_hr_timesheet_invoice_journal') + cr.execute('ALTER TABLE product_uom RENAME COLUMN factor to temp_column') cr.execute('ALTER TABLE product_uom ADD COLUMN factor NUMERIC(12,6)') cr.execute('UPDATE product_uom SET factor = temp_column') - cr.execute('ALTER TABLE product_uom SET factor NOT NULL') + cr.execute('ALTER TABLE product_uom ALTER factor SET NOT NULL') cr.execute('ALTER TABLE product_uom DROP COLUMN temp_column') +cr.commit() # ------------------------------------------------- #