Rename uom_once to uom_ounce, fixes issue1414

This commit is contained in:
Phillip Heller
2010-09-25 11:39:17 -04:00
parent 57d1b6f2c2
commit 841306b91c
6 changed files with 17 additions and 9 deletions
+2 -2
View File
@@ -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
1 type name res_id src value fuzzy
121 model product.uom,name uom_square_foot Square foot Quadratfuß 0
122 model product.uom,name uom_square_inch Square inch Quadratzoll 0
123 model product.uom,name uom_square_meter Square meter Quadratmeter 0
124 model product.uom,name uom_square_yard Square yard Quadratyard(s) 0
125 model product.uom,name uom_unit Unit Stück 0
126 model product.uom,name 0 Unit of measure Maßeinheit 0
127 model product.uom,name uom_work_day Work Day Personentag(e) 0
159 model product.uom,symbol uom_yard yd yd 0
160 model product.uom,symbol uom_square_yard yd² yd² 0
161 model res.group,name group_product_admin Product Administration Artikel Administration 0
162 selection product.template,cost_price_method 0 Average Durchschnitt 0
163 selection product.template,cost_price_method 0 Fixed Fix 0
164 selection product.template,type 0 Consumable Verbrauchsmaterial 0
165 selection product.template,type 0 Service Dienstleistung 0
+2 -2
View File
@@ -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
1 type name res_id src value fuzzy
91 model product.uom,name uom_minute Minute Minuto 0
92 model product.uom,name uom_once uom_ounce Ounce Onza 0
93 model product.uom,name uom_pound Pound Libra 0
94 model product.uom,name uom_second Second Segundo 0
95 model product.uom,name uom_square_centimeter Square centimeter Centímetro Cuadrado 0
96 model product.uom,name uom_square_foot Square foot Pie Cuadrado 0
97 model product.uom,name uom_square_inch Square inch Pulgada Cuadrada 0
129 model product.uom,symbol uom_millimeter mm mm 0
130 model product.uom,symbol uom_once uom_ounce oz oz 0
131 model product.uom,symbol uom_second s s 0
132 model product.uom,symbol uom_unit u u 0
133 model product.uom,symbol uom_work_day wd wd 0
134 model product.uom,symbol uom_yard yd yd 0
135 model product.uom,symbol uom_square_yard yd² yd² 0
+2 -2
View File
@@ -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
1 type name res_id src value fuzzy
87 model product.uom,name uom_pound Pound Libra 0
88 model product.uom,name uom_second Second Segundo 0
89 model product.uom,name uom_square_centimeter Square centimeter Centímetro cuadrado 0
90 model product.uom,name uom_square_foot Square foot Pie cuadrado 0
91 model product.uom,name uom_square_inch Square inch Pulgada cuadrada 0
92 model product.uom,name uom_square_meter Square meter Metro cuadrado 0
93 model product.uom,name uom_square_yard Square yard Yarda cuadrada 0
125 model product.uom,symbol uom_second s s 0
126 model product.uom,symbol uom_unit u u 0
127 model product.uom,symbol uom_work_day wd wd 0
128 model product.uom,symbol uom_yard yd yd 0
129 model product.uom,symbol uom_square_yard yd² yd² 0
130 model res.group,name group_product_admin Product Administration Administración de productos 0
131 selection product.template,cost_price_method 0 Average Promedio 0
+2 -2
View File
@@ -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
1 type name res_id src value fuzzy
93 model product.uom,name uom_pound Pound Livre 0
94 model product.uom,name uom_second Second Seconde 0
95 model product.uom,name uom_square_centimeter Square centimeter Centimètre carré 0
96 model product.uom,name uom_square_foot Square foot Pied carré 0
97 model product.uom,name uom_square_inch Square inch Pouce carré 0
98 model product.uom,name uom_square_meter Square meter Mètre carré 0
99 model product.uom,name uom_square_yard Square yard Yard carré 0
131 model product.uom,symbol uom_second s s 0
132 model product.uom,symbol uom_unit u u 0
133 model product.uom,symbol uom_work_day wd wd 0
134 model product.uom,symbol uom_yard yd yd 0
135 model product.uom,symbol uom_square_yard yd² yd ² 0
136 model res.group,name group_product_admin Product Administration Administration de produits 0
137 selection product.template,cost_price_method 0 Average Moyen 0
+8
View File
@@ -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 += [
+1 -1
View File
@@ -189,7 +189,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="factor" eval="0.45359237"/>
<field name="rate" eval="round(1.0 / 0.45359237, 12)"/>
</record>
<record model="product.uom" id="uom_once">
<record model="product.uom" id="uom_ounce">
<field name="name">Ounce</field>
<field name="symbol">oz</field>
<field name="category" ref="uom_cat_weight"/>