[IMP] sort stock picking by id, no percent label for tax amount

bzr revid: mat@openerp.com-20130528115811-klv4spx00srr4vqb

diff --cc addons/account/account_view.xml
index 5fc228c,dae9065..ccb9949
--- 1/addons/account/account_view.xml
--- 2/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@@ -907,9 -907,9 +907,7 @@@
                                  <label for="type"/>
                                  <div>
                                      <field name="type"/>
--                                    <field name="amount" class="oe_inline"
--                                        attrs="{'invisible':[('type','in',('none', 'code', 'balance'))]}"/>
-                                     <label string="%%" attrs="{'invisible':[('type','&lt;&gt;','percent')]}"/>
 -                                    <label string="%% ratio between 0-1" attrs="{'invisible':[('type','&lt;&gt;','percent')]}"/>
++                                    <field name="amount" attrs="{'invisible':[('type','in',('none', 'code', 'balance'))]}"/>
                                  </div>
                                  <field name="python_compute" attrs="{'invisible':[('type','!=','code')],'required':[('type','=','code')]}"/>
                                  <field name="python_compute_inv" attrs="{'invisible':[('type','!=','code')],'required':[('type','=','code')]}"/>

diff --cc addons/stock/stock.py
Simple merge