[MERGE] useability addons10

bzr revid: fp@tinyerp.com-20120926074121-tgdlrobcm6cjiz9a

diff --cc addons/product/product_view.xml
index c08bbc4,2d153fa..8c19aee
--- 1/addons/product/product_view.xml
--- 2/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@@ -467,11 -465,13 +467,15 @@@
                          </group>
                          <group>
                              <field name="uom_type" on_change="onchange_type(uom_type)"/>
 -                            <label string=""/>
 -                            <label string="e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
 -                            <label string=""/>
 -                            <label string="e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
++                            <p attrs="{'invisible':[('uom_type','!=','smaller')]}" colspan="2">
++                                e.g: 1 * (reference unit) = ratio * (this unit)
++                            </p>
++                            <p attrs="{'invisible':[('uom_type','!=','bigger')]}" colspan="2">
++                                e.g: 1 * (this unit) = ratio * (reference unit)
++                            </p>
                              <field name="rounding"/>
                              <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                             <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                              <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                             <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                          </group>
                      </group>
                  </form>

diff --cc addons/stock/stock.py
index 2a03a7b,b5a6c74..dd30363
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -1169,9 -1171,9 +1169,10 @@@ class stock_picking(osv.osv)
              if not pick.move_lines:
                  return True
              for move in pick.move_lines:
 -                if move.state == 'done' and not move.scrapped:
 -                    raise osv.except_osv(_('Error!'), _('You cannot cancel picking because stock move is in done state!'))
 +                if move.state == 'done':
-                     raise osv.except_osv(_('Error!'), _('You cannot cancel picking because stock move is in done state!'))
++                    raise osv.except_osv(_('Error!'), _('You cannot cancel the picking as some moves have been done. You should cancel the picking lines.'))
          return True
++
      def unlink(self, cr, uid, ids, context=None):
          move_obj = self.pool.get('stock.move')
          if context is None: