diff --git a/de_DE.csv b/de_DE.csv
index dc9799642a..2cf5ae7618 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -121,7 +121,7 @@ model,"product.uom,name",uom_meter,Meter,Meter,0
model,"product.uom,name",uom_mile,Mile,Meile(n),0
model,"product.uom,name",uom_millimeter,Millimeter,Millimeter,0
model,"product.uom,name",uom_minute,Minute,Minute(n),0
-model,"product.uom,name",uom_once,Ounce,Unze(n),0
+model,"product.uom,name",uom_ounce,Ounce,Unze(n),0
model,"product.uom,name",uom_pound,Pound,Pfund,0
model,"product.uom,name",uom_second,Second,Sekunde(n),0
model,"product.uom,name",uom_square_centimeter,Square centimeter,Quadratzentimeter,0
@@ -159,7 +159,7 @@ model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_mile,mi,mi,0
model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
model,"product.uom,symbol",uom_second,s,s,0
model,"product.uom,symbol",uom_unit,u,St.,0
model,"product.uom,symbol",uom_work_day,wd,PT,0
diff --git a/es_CO.csv b/es_CO.csv
index 6cd09c374a..4234286c49 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -91,7 +91,7 @@ model,"product.uom,name",uom_meter,Meter,Metro,0
model,"product.uom,name",uom_mile,Mile,Milla,0
model,"product.uom,name",uom_millimeter,Millimeter,Milímetro,0
model,"product.uom,name",uom_minute,Minute,Minuto,0
-model,"product.uom,name",uom_once,Ounce,Onza,0
+model,"product.uom,name",uom_ounce,Ounce,Onza,0
model,"product.uom,name",uom_pound,Pound,Libra,0
model,"product.uom,name",uom_second,Second,Segundo,0
model,"product.uom,name",uom_square_centimeter,Square centimeter,Centímetro Cuadrado,0
@@ -129,7 +129,7 @@ model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_mile,mi,mi,0
model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
model,"product.uom,symbol",uom_second,s,s,0
model,"product.uom,symbol",uom_unit,u,u,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
diff --git a/es_ES.csv b/es_ES.csv
index dd4a36eb19..28af914c86 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -87,7 +87,7 @@ model,"product.uom,name",uom_meter,Meter,Metro,0
model,"product.uom,name",uom_mile,Mile,Milla,0
model,"product.uom,name",uom_millimeter,Millimeter,Milímetro,0
model,"product.uom,name",uom_minute,Minute,Minuto,0
-model,"product.uom,name",uom_once,Ounce,Onza,0
+model,"product.uom,name",uom_ounce,Ounce,Onza,0
model,"product.uom,name",uom_pound,Pound,Libra,0
model,"product.uom,name",uom_second,Second,Segundo,0
model,"product.uom,name",uom_square_centimeter,Square centimeter,Centímetro cuadrado,0
@@ -125,7 +125,7 @@ model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_mile,mi,mi,0
model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
model,"product.uom,symbol",uom_second,s,s,0
model,"product.uom,symbol",uom_unit,u,u,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 7480d47ef6..a3e19c848b 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -93,7 +93,7 @@ model,"product.uom,name",uom_meter,Meter,Mètre,0
model,"product.uom,name",uom_mile,Mile,Mille,0
model,"product.uom,name",uom_millimeter,Millimeter,Millimètre,0
model,"product.uom,name",uom_minute,Minute,Minute,0
-model,"product.uom,name",uom_once,Ounce,Once,0
+model,"product.uom,name",uom_ounce,Ounce,Once,0
model,"product.uom,name",uom_pound,Pound,Livre,0
model,"product.uom,name",uom_second,Second,Seconde,0
model,"product.uom,name",uom_square_centimeter,Square centimeter,Centimètre carré,0
@@ -131,7 +131,7 @@ model,"product.uom,symbol",uom_cubic_meter,m³,m³,0
model,"product.uom,symbol",uom_mile,mi,mi,0
model,"product.uom,symbol",uom_minute,min,min,0
model,"product.uom,symbol",uom_millimeter,mm,mm,0
-model,"product.uom,symbol",uom_once,oz,oz,0
+model,"product.uom,symbol",uom_ounce,oz,oz,0
model,"product.uom,symbol",uom_second,s,s,0
model,"product.uom,symbol",uom_unit,u,u,0
model,"product.uom,symbol",uom_work_day,wd,wd,0
diff --git a/uom.py b/uom.py
index ffdb87c3f9..a530902382 100644
--- a/uom.py
+++ b/uom.py
@@ -47,6 +47,14 @@ class Uom(ModelSQL, ModelView):
digits = fields.Integer('Display Digits')
active = fields.Boolean('Active')
+ def init(self, module_name):
+ cursor = Transaction().cursor
+ # Migration from 1.6: corrected misspelling of ounce (was once)
+ cursor.execute("UPDATE ir_model_data "\
+ "SET fs_id = REPLACE(fs_id, 'uom_once', 'uom_ounce') "\
+ "WHERE fs_id = 'uom_once' AND module = 'product'")
+ super(Uom, self).init(module_name)
+
def __init__(self):
super(Uom, self).__init__()
self._sql_constraints += [
diff --git a/uom.xml b/uom.xml
index 2d09ccc594..8d215fd119 100644
--- a/uom.xml
+++ b/uom.xml
@@ -189,7 +189,7 @@ this repository contains the full copyright notices and license terms. -->
-
+
Ounce
oz