diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index b6473a7f1a7..dde63479ba1 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -745,6 +745,8 @@ class calendar_event(osv.Model):
def _compute(self, cr, uid, ids, fields, arg, context=None):
res = {}
+ if not isinstance(fields, list):
+ fields = [fields]
for meeting_id in ids:
res[meeting_id] = {}
attendee = self._find_my_attendee(cr, uid, [meeting_id], context)
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 646a047d63c..326316131a2 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -99,7 +99,7 @@ class stock_change_product_qty(osv.osv_memory):
'location_id': data.location_id.id,
'product_id': rec_id,
'product_uom_id': res_original.uom_id.id,
- 'th_qty': th_qty,
+ 'theoretical_qty': th_qty,
'prod_lot_id': data.lot_id.id
}
inventory_line_obj.create(cr , uid, line_data, context=context)
diff --git a/addons/stock_account/product_view.xml b/addons/stock_account/product_view.xml
index 960280154fd..bc921d5c307 100644
--- a/addons/stock_account/product_view.xml
+++ b/addons/stock_account/product_view.xml
@@ -31,14 +31,6 @@
-
-
-
-
- product.product.standard.price.form.inherit
- product.product
-
-
@@ -49,15 +41,6 @@
class="oe_link" groups="stock_account.group_inventory_valuation"/>
-
-
-
-
- product.normal.stock.acc.property.form.inherit
- product.product
-
- 26
-
@@ -73,6 +56,7 @@
+